Don’t store pregenerated config lookup tables in the repo

We have had a requirement on gperf for the build-from-repo case for a
while now, so there is no real point in keeping generated gperf lookup
table code in the repository.

diff --git a/.gitignore b/.gitignore
index d77b706d01c275d2b94c91e000a004f6b6fa827b..c4c1a7d34c55269f699c67542c19be38d85e3998 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -20,6 +20,7 @@ dev.mk
 dev_mode_disabled
 doc/ccache.1
 perfdir.*
+src/*_lookup.c
 src/version.c
 testdir.*
 unittest/run

diff --git a/.travis.yml b/.travis.yml
index c9245b346cb96cf176c4bdd5379a48b11b973309..2fde4bda9e0e077f7405a27f2173dc3fcbe14054 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,6 +24,7 @@ matrix:
               apt:
                   packages:
                       - gcc-multilib
+                      - gperf
                       - lib32z1-dev
         - os: linux
           compiler: i686-w64-mingw32-gcc
@@ -32,6 +33,7 @@ matrix:
               apt:
                   packages:
                       - gcc-mingw-w64-i686
+                      - gperf
         - os: linux
           compiler: clang
           env: CFLAGS="-fsanitize=undefined" LDFLAGS="-fsanitize=undefined" ASAN_OPTIONS="detect_leaks=0"

diff --git a/Makefile.in b/Makefile.in
index c113e8152ef4aa6ecd1eb71c764de5f05419bef9..83beae1ef6826d819bfa849469365c381a217d74 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -49,11 +49,11 @@ non_3pp_sources = \
     src/unify.c \
     src/util.c
 generated_sources = \
+    src/confitems_lookup.c \
+    src/envtoconfitems_lookup.c \
     src/version.c
 3pp_sources = \
     src/getopt_long.c \
-    src/confitems_lookup.c \
-    src/envtoconfitems_lookup.c \
     src/hashtable.c \
     src/hashtable_itr.c \
     src/murmurhashneutral2.c \

diff --git a/dev.mk.in b/dev.mk.in
index 26c2a2c61fe37a44ede819f1a04d39fb697343ad..2abddb594fd723d5b1be1e472e988d5f34dc4dc9 100644 (file)
--- a/dev.mk.in
+++ b/dev.mk.in
@@ -63,6 +63,8 @@ generated_headers = \
 
 files_to_clean += *.tar.bz2 *.tar.gz *.tar.xz *.xml .deps/* perfdir.*
 files_to_clean += compile_commands.json
+files_to_clean += src/confitems_lookup.c
+files_to_clean += src/envtoconfitems_lookup.c
 files_to_distclean += $(built_dist_files) src/version.c unittest/suites.h
 files_to_distclean += .deps dev.mk
 
@@ -113,10 +115,18 @@ ifneq ($(shell sed 's/.*"\(.*\)".*/\1/' src/version.c 2>/dev/null),$(version))
 endif
 src/version.o: src/version.c
 
-%_lookup.c: %.gperf
-       $(if $(quiet),@echo "  GPERF    $@")
-       $(Q)$(GPERF) $< >$@
-       $(Q)echo "size_t $$(echo '$(notdir $*)_count(void)') { return $$(sed -nr 's/.*TOTAL_KEYWORDS = (.+),.*/\1/p' $@); }" >>$@
+define generate_gperf_lookup
+src/$(1)_lookup.c: src/$(1).gperf
+       $$(if $$(quiet),@echo "  GEN      $$@")
+       $$(Q)$$(GPERF) $$< >$$@.tmp
+# Fix for gperf < 3.1 (fix parameter type and remove inlining of the get function):
+       $$(Q)perl -00 -pi -e 's/unsigned int len/size_t len/; s/#ifdef __GNUC__.*?gnu_inline.*?#endif\n#endif\n//sg' $$@.tmp
+       $$(Q)echo "size_t $(1)_count(void) { return $$$$(perl -ne '/TOTAL_KEYWORDS = (.+?),/ && print $$$$1' $$@.tmp); }" >>$$@.tmp
+       $$(Q)mv $$@.tmp $$@
+endef
+
+$(eval $(call generate_lookup_table,confitems))
+$(eval $(call generate_lookup_table,envtoconfitems))
 
 .PHONY: dist
 dist: $(dist_archives)

diff --git a/src/confitems_lookup.c b/src/confitems_lookup.c
deleted file mode 100644 (file)
index 9ab7fc3..0000000
--- a/src/confitems_lookup.c
+++ /dev/null
@@ -1,200 +0,0 @@
-/* ANSI-C code produced by gperf version 3.1 */
-/* Command-line: gperf src/confitems.gperf  */
-/* Computed positions: -k'1-2' */
-
-#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
-      && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
-      && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
-      && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
-      && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
-      && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
-      && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
-      && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
-      && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
-      && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
-      && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
-      && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
-      && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
-      && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
-      && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
-      && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
-      && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
-      && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
-      && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
-      && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
-      && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
-      && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
-      && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
-/* The character set is not based on ISO-646.  */
-#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gperf@gnu.org>."
-#endif
-
-#line 8 "src/confitems.gperf"
-
-#include "confitems.h"
-#include "conf.h"
-
-#undef bool
-#define ITEM_ENTRY(name, type, verify_fn) \
-       offsetof(struct conf, name), confitem_parse_ ## type, \
-       confitem_format_ ## type, verify_fn
-#define ITEM(name, type) \
-       ITEM_ENTRY(name, type, NULL)
-#define ITEM_V(name, type, verification) \
-       ITEM_ENTRY(name, type, confitem_verify_ ## verification)
-#line 21 "src/confitems.gperf"
-struct conf_item;
-/* maximum key range = 46, duplicates = 0 */
-
-#ifdef __GNUC__
-__inline
-#else
-#ifdef __cplusplus
-inline
-#endif
-#endif
-static unsigned int
-confitems_hash (register const char *str, register size_t len)
-{
-  static const unsigned char asso_values[] =
-    {
-      50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
-      50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
-      50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
-      50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
-      50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
-      50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
-      50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
-      50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
-      50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
-      50, 50, 50, 50, 50, 50, 50,  0, 35,  0,
-       5, 10, 50,  0, 30, 20, 50,  0, 10, 20,
-      15,  0,  0, 50,  5, 10, 10, 15, 50, 50,
-      20, 50, 50, 50, 50, 50, 50, 50, 50, 50,
-      50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
-      50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
-      50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
-      50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
-      50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
-      50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
-      50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
-      50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
-      50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
-      50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
-      50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
-      50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
-      50, 50, 50, 50, 50, 50
-    };
-  return len + asso_values[(unsigned char)str[1]] + asso_values[(unsigned char)str[0]];
-}
-
-const struct conf_item *
-confitems_get (register const char *str, register size_t len)
-{
-  enum
-    {
-      TOTAL_KEYWORDS = 34,
-      MIN_WORD_LENGTH = 4,
-      MAX_WORD_LENGTH = 26,
-      MIN_HASH_VALUE = 4,
-      MAX_HASH_VALUE = 49
-    };
-
-  static const struct conf_item wordlist[] =
-    {
-      {"",0,0,NULL,NULL,NULL}, {"",0,0,NULL,NULL,NULL},
-      {"",0,0,NULL,NULL,NULL}, {"",0,0,NULL,NULL,NULL},
-#line 44 "src/confitems.gperf"
-      {"path",                21, ITEM(path, env_string)},
-      {"",0,0,NULL,NULL,NULL}, {"",0,0,NULL,NULL,NULL},
-      {"",0,0,NULL,NULL,NULL},
-#line 26 "src/confitems.gperf"
-      {"compiler",             3, ITEM(compiler, string)},
-#line 24 "src/confitems.gperf"
-      {"cache_dir",            1, ITEM(cache_dir, env_string)},
-      {"",0,0,NULL,NULL,NULL},
-#line 28 "src/confitems.gperf"
-      {"compression",          5, ITEM(compression, bool)},
-      {"",0,0,NULL,NULL,NULL},
-#line 30 "src/confitems.gperf"
-      {"cpp_extension",        7, ITEM(cpp_extension, string)},
-#line 27 "src/confitems.gperf"
-      {"compiler_check",       4, ITEM(compiler_check, string)},
-      {"",0,0,NULL,NULL,NULL},
-#line 25 "src/confitems.gperf"
-      {"cache_dir_levels",     2, ITEM_V(cache_dir_levels, unsigned, dir_levels)},
-#line 29 "src/confitems.gperf"
-      {"compression_level",    6, ITEM(compression_level, unsigned)},
-#line 41 "src/confitems.gperf"
-      {"log_file",            18, ITEM(log_file, env_string)},
-#line 46 "src/confitems.gperf"
-      {"prefix_command",      23, ITEM(prefix_command, env_string)},
-#line 31 "src/confitems.gperf"
-      {"debug",                8, ITEM(debug, bool)},
-#line 45 "src/confitems.gperf"
-      {"pch_external_checksum", 22, ITEM(pch_external_checksum, bool)},
-#line 50 "src/confitems.gperf"
-      {"recache",             27, ITEM(recache, bool)},
-#line 47 "src/confitems.gperf"
-      {"prefix_command_cpp",  24, ITEM(prefix_command_cpp, env_string)},
-#line 48 "src/confitems.gperf"
-      {"read_only",           25, ITEM(read_only, bool)},
-#line 53 "src/confitems.gperf"
-      {"stats",               30, ITEM(stats, bool)},
-#line 32 "src/confitems.gperf"
-      {"depend_mode",          9, ITEM(depend_mode, bool)},
-#line 39 "src/confitems.gperf"
-      {"keep_comments_cpp",   16, ITEM(keep_comments_cpp, bool)},
-#line 43 "src/confitems.gperf"
-      {"max_size",            20, ITEM(max_size, size)},
-#line 42 "src/confitems.gperf"
-      {"max_files",           19, ITEM(max_files, unsigned)},
-#line 52 "src/confitems.gperf"
-      {"sloppiness",          29, ITEM(sloppiness, sloppiness)},
-#line 49 "src/confitems.gperf"
-      {"read_only_direct",    26, ITEM(read_only_direct, bool)},
-#line 34 "src/confitems.gperf"
-      {"disable",             11, ITEM(disable, bool)},
-#line 54 "src/confitems.gperf"
-      {"temporary_dir",       31, ITEM(temporary_dir, env_string)},
-#line 51 "src/confitems.gperf"
-      {"run_second_cpp",      28, ITEM(run_second_cpp, bool)},
-#line 56 "src/confitems.gperf"
-      {"unify",               33, ITEM(unify, bool)},
-#line 33 "src/confitems.gperf"
-      {"direct_mode",         10, ITEM(direct_mode, bool)},
-      {"",0,0,NULL,NULL,NULL},
-#line 37 "src/confitems.gperf"
-      {"hash_dir",            14, ITEM(hash_dir, bool)},
-#line 36 "src/confitems.gperf"
-      {"hard_link",           13, ITEM(hard_link, bool)},
-#line 55 "src/confitems.gperf"
-      {"umask",               32, ITEM(umask, umask)},
-      {"",0,0,NULL,NULL,NULL}, {"",0,0,NULL,NULL,NULL},
-#line 23 "src/confitems.gperf"
-      {"base_dir",             0, ITEM_V(base_dir, env_string, absolute_path)},
-#line 40 "src/confitems.gperf"
-      {"limit_multiple",      17, ITEM(limit_multiple, double)},
-      {"",0,0,NULL,NULL,NULL},
-#line 38 "src/confitems.gperf"
-      {"ignore_headers_in_manifest", 15, ITEM(ignore_headers_in_manifest, env_string)},
-      {"",0,0,NULL,NULL,NULL}, {"",0,0,NULL,NULL,NULL},
-#line 35 "src/confitems.gperf"
-      {"extra_files_to_hash", 12, ITEM(extra_files_to_hash, env_string)}
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      register unsigned int key = confitems_hash (str, len);
-
-      if (key <= MAX_HASH_VALUE)
-        {
-          register const char *s = wordlist[key].name;
-
-          if (*str == *s && !strcmp (str + 1, s + 1))
-            return &wordlist[key];
-        }
-    }
-  return 0;
-}
-size_t confitems_count(void) { return 34; }

diff --git a/src/envtoconfitems_lookup.c b/src/envtoconfitems_lookup.c
deleted file mode 100644 (file)
index 5ab97ed..0000000
--- a/src/envtoconfitems_lookup.c
+++ /dev/null
@@ -1,207 +0,0 @@
-/* ANSI-C code produced by gperf version 3.1 */
-/* Command-line: gperf src/envtoconfitems.gperf  */
-/* Computed positions: -k'4-5' */
-
-#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
-      && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
-      && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
-      && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
-      && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
-      && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
-      && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
-      && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
-      && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
-      && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
-      && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
-      && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
-      && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
-      && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
-      && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
-      && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
-      && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
-      && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
-      && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
-      && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
-      && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
-      && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
-      && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
-/* The character set is not based on ISO-646.  */
-#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gperf@gnu.org>."
-#endif
-
-#line 9 "src/envtoconfitems.gperf"
-
-#include "envtoconfitems.h"
-#line 12 "src/envtoconfitems.gperf"
-struct env_to_conf_item;
-/* maximum key range = 52, duplicates = 0 */
-
-#ifdef __GNUC__
-__inline
-#else
-#ifdef __cplusplus
-inline
-#endif
-#endif
-static unsigned int
-envtoconfitems_hash (register const char *str, register size_t len)
-{
-  static const unsigned char asso_values[] =
-    {
-      54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
-      54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
-      54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
-      54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
-      54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
-       0, 54, 54, 54, 54, 54, 54, 54, 54, 54,
-      54, 54, 54, 54, 54, 25, 10,  0,  0,  5,
-      10,  0, 15,  0, 54, 10, 35, 25, 10, 25,
-       0, 54, 15, 20,  0,  0, 25, 54, 54, 15,
-      54, 54, 54, 54, 54,  0, 54, 54, 54, 54,
-      54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
-      54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
-      54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
-      54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
-      54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
-      54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
-      54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
-      54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
-      54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
-      54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
-      54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
-      54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
-      54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
-      54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
-      54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
-      54, 54, 54, 54, 54, 54
-    };
-  register unsigned int hval = len;
-
-  switch (hval)
-    {
-      default:
-        hval += asso_values[(unsigned char)str[4]];
-      /*FALLTHROUGH*/
-      case 4:
-        hval += asso_values[(unsigned char)str[3]];
-      /*FALLTHROUGH*/
-      case 3:
-      case 2:
-        break;
-    }
-  return hval;
-}
-
-const struct env_to_conf_item *
-envtoconfitems_get (register const char *str, register size_t len)
-{
-  enum
-    {
-      TOTAL_KEYWORDS = 35,
-      MIN_WORD_LENGTH = 2,
-      MAX_WORD_LENGTH = 15,
-      MIN_HASH_VALUE = 2,
-      MAX_HASH_VALUE = 53
-    };
-
-  static const struct env_to_conf_item wordlist[] =
-    {
-      {"",""}, {"",""},
-#line 15 "src/envtoconfitems.gperf"
-      {"CC", "compiler"},
-#line 23 "src/envtoconfitems.gperf"
-      {"DIR", "cache_dir"},
-#line 20 "src/envtoconfitems.gperf"
-      {"CPP2", "run_second_cpp"},
-#line 24 "src/envtoconfitems.gperf"
-      {"DEBUG", "debug"},
-      {"",""},
-#line 46 "src/envtoconfitems.gperf"
-      {"TEMPDIR", "temporary_dir"},
-#line 16 "src/envtoconfitems.gperf"
-      {"COMPILER", "compiler"},
-      {"",""},
-#line 44 "src/envtoconfitems.gperf"
-      {"SLOPPINESS", "sloppiness"},
-#line 25 "src/envtoconfitems.gperf"
-      {"DIRECT", "direct_mode"},
-#line 14 "src/envtoconfitems.gperf"
-      {"BASEDIR", "base_dir"},
-#line 17 "src/envtoconfitems.gperf"
-      {"COMPILERCHECK", "compiler_check"},
-#line 32 "src/envtoconfitems.gperf"
-      {"LIMIT_MULTIPLE", "limit_multiple"},
-#line 38 "src/envtoconfitems.gperf"
-      {"PCH_EXTSUM", "pch_external_checksum"},
-#line 39 "src/envtoconfitems.gperf"
-      {"PREFIX", "prefix_command"},
-#line 33 "src/envtoconfitems.gperf"
-      {"LOGFILE", "log_file"},
-#line 34 "src/envtoconfitems.gperf"
-      {"MAXFILES", "max_files"},
-#line 37 "src/envtoconfitems.gperf"
-      {"PATH", "path"},
-#line 40 "src/envtoconfitems.gperf"
-      {"PREFIX_CPP", "prefix_command_cpp"},
-#line 22 "src/envtoconfitems.gperf"
-      {"DEPEND", "depend_mode"},
-#line 30 "src/envtoconfitems.gperf"
-      {"HASHDIR", "hash_dir"},
-#line 18 "src/envtoconfitems.gperf"
-      {"COMPRESS", "compression"},
-#line 27 "src/envtoconfitems.gperf"
-      {"EXTENSION", "cpp_extension"},
-#line 45 "src/envtoconfitems.gperf"
-      {"STATS", "stats"},
-      {"",""},
-#line 35 "src/envtoconfitems.gperf"
-      {"MAXSIZE", "max_size"},
-#line 19 "src/envtoconfitems.gperf"
-      {"COMPRESSLEVEL", "compression_level"},
-      {"",""},
-#line 48 "src/envtoconfitems.gperf"
-      {"UNIFY", "unify"},
-      {"",""},
-#line 43 "src/envtoconfitems.gperf"
-      {"RECACHE", "recache"},
-#line 41 "src/envtoconfitems.gperf"
-      {"READONLY", "read_only"},
-      {"",""},
-#line 47 "src/envtoconfitems.gperf"
-      {"UMASK", "umask"},
-      {"",""},
-#line 36 "src/envtoconfitems.gperf"
-      {"NLEVELS", "cache_dir_levels"},
-#line 21 "src/envtoconfitems.gperf"
-      {"COMMENTS", "keep_comments_cpp"},
-      {"",""},
-#line 42 "src/envtoconfitems.gperf"
-      {"READONLY_DIRECT", "read_only_direct"},
-      {"",""},
-#line 26 "src/envtoconfitems.gperf"
-      {"DISABLE", "disable"},
-#line 29 "src/envtoconfitems.gperf"
-      {"HARDLINK", "hard_link"},
-      {"",""}, {"",""}, {"",""}, {"",""}, {"",""}, {"",""},
-#line 28 "src/envtoconfitems.gperf"
-      {"EXTRAFILES", "extra_files_to_hash"},
-      {"",""}, {"",""},
-#line 31 "src/envtoconfitems.gperf"
-      {"IGNOREHEADERS", "ignore_headers_in_manifest"}
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      register unsigned int key = envtoconfitems_hash (str, len);
-
-      if (key <= MAX_HASH_VALUE)
-        {
-          register const char *s = wordlist[key].env_name;
-
-          if (*str == *s && !strcmp (str + 1, s + 1))
-            return &wordlist[key];
-        }
-    }
-  return 0;
-}
-size_t envtoconfitems_count(void) { return 35; }