Adjust to recent changes to gnulib bootstrap.

[bison.git] / bootstrap.conf

diff --git a/bootstrap.conf b/bootstrap.conf
index 4d9aaf8f46347c361427a67328480cc7f607f864..5d67087fd1ffc8cf3084d66196fbe6c54342a26a 100644 (file)
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -20,7 +20,7 @@ gnulib_modules='
   announce-gen argmatch assert config-h c-strcase configmake dirname
   error extensions fopen-safer gendocs getopt-gnu gettext
   git-version-gen hash inttypes javacomp-script javaexec-script
-  maintainer-makefile malloc mbswidth obstack pipe quote quotearg
+  maintainer-makefile malloc-gnu mbswidth obstack pipe quote quotearg
   realloc-posix stdbool stpcpy strerror strtoul strverscmp unistd
   unistd-safer unlocked-io update-copyright unsetenv verify warnings
   xalloc xalloc-die xstrndup
@@ -45,28 +45,25 @@ XGETTEXT_OPTIONS_RUNTIME=$XGETTEXT_OPTIONS'\\\
 # Gettext supplies these files, but we don't need them since
 # we don't have an intl subdirectory.
 excluded_files='
-    m4/codeset.m4
     m4/glibc2.m4
-    m4/glibc21.m4
     m4/intdiv0.m4
     m4/intl.m4
     m4/intldir.m4
     m4/intmax.m4
-    m4/inttypes_h.m4
     m4/lcmessage.m4
     m4/lock.m4
     m4/longdouble.m4
     m4/signed.m4
-    m4/size_max.m4
     m4/uintmax_t.m4
     m4/ulonglong.m4
     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'
+# Massage lib/gnulib.mk before using it later in the bootstrapping process.
+gnulib_mk_hook()
+{
+  etc/prefix-gnulib-mk $1
+}
 
 bootstrap_epilogue()
 {