Simplify code for variants bench marks.

[bison.git] / bootstrap.conf

diff --git a/bootstrap.conf b/bootstrap.conf
index 669777c65305772fd2c5622a6a6455225a3fdf1d..bcab1b89d1206020c58d3254410440d427d5df18 100644 (file)
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -17,17 +17,12 @@
 
 # gnulib modules used by this package.
 gnulib_modules='
-       argmatch config-h c-strcase configmake
-       dirname error extensions fopen-safer git-version-gen
-       getopt gettext hash inttypes javacomp-script javaexec-script malloc
+       announce-gen argmatch config-h c-strcase configmake
+       dirname error extensions fopen-safer getopt gettext git-version-gen
+       gnumakefile hash inttypes javacomp-script javaexec-script malloc
        mbswidth obstack quote quotearg stdbool stpcpy strerror strtoul
-       strverscmp unistd unistd-safer unlocked-io verify xalloc xalloc-die
-       xstrndup
-'
-
-# Any gnulib files needed that are not in modules.
-gnulib_files='
-       m4/warning.m4
+       strverscmp unistd unistd-safer unlocked-io unsetenv verify
+       warnings xalloc xalloc-die xstrndup
 '
 
 # Additional xgettext options to use.  Use "\\\newline" to break lines.
@@ -65,3 +60,7 @@ excluded_files='
     m4/visibility.m4
     m4/xsize.m4
 '
+
+# In directories like lib/, m4/, and po/, generate both these files because we
+# still try to support CVS emulation.
+vc_ignore='.cvsignore .gitignore'