Merge remote-tracking branch 'origin/maint'

[bison.git] / bootstrap.conf

diff --git a/bootstrap.conf b/bootstrap.conf
index e7354675030f6d6ca618204f9a886dff0df78617..cff387f98b94a16404b0ac565cecc64887e7713a 100644 (file)
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -17,13 +17,13 @@
 
 # gnulib modules used by this package.
 gnulib_modules='
-  announce-gen argmatch assert calloc-posix close closeout config-h c-strcase
+  argmatch assert calloc-posix close closeout config-h c-strcase
   configmake
   dirname
-  error extensions fdl fopen-safer gendocs getopt-gnu
+  error extensions fdl fopen-safer getopt-gnu
   gettext git-version-gen gitlog-to-changelog
   gpl-3.0 hash inttypes isnan javacomp-script
-  javaexec-script ldexpl maintainer-makefile malloc-gnu mbschr mbsrchr
+  javaexec-script ldexpl malloc-gnu
   mbswidth obstack perror progname
   quote quotearg
   readme-release
@@ -31,7 +31,11 @@ gnulib_modules='
   spawn-pipe stdbool stpcpy strdup-posix strerror strtoul strverscmp
   unistd unistd-safer unlocked-io update-copyright unsetenv verify
   warnings
-  xalloc xalloc-die xmemdup0 xstrndup
+  xalloc
+  xalloc-die
+  xconcat-filename
+  xmemdup0
+  xstrndup
 
   fprintf-posix printf-posix snprintf-posix sprintf-posix
   vsnprintf-posix vsprintf-posix
@@ -71,6 +75,9 @@ gnulib_tool_option_extras='--symlink --makefile-name=gnulib.mk'
 
 bootstrap_post_import_hook()
 {
+  # Massage lib/gnulib.mk before using it later in the bootstrapping process.
+  etc/prefix-gnulib-mk --lib-name=$gnulib_name lib/$gnulib_mk
+
   # Ensure that ChangeLog exists, for automake.
   test -f ChangeLog || touch ChangeLog
 }