X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/68f91d58f15abe21c65a8b4d7022ccb854c857dc..d116722c542af7c6c85012064aa06c0f4d8d3d01:/bootstrap.conf?ds=inline

diff --git a/bootstrap.conf b/bootstrap.conf
index d0685c22..c58470e2 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -21,12 +21,12 @@ gnulib_modules='
   configmake
   dirname
   error extensions fdl fopen-safer
-  getline
   getopt-gnu
   gettext git-version-gen gitlog-to-changelog
   gpl-3.0 hash inttypes isnan javacomp-script
-  javaexec-script ldexpl malloc-gnu mbschr mbsrchr
+  javaexec-script ldexpl malloc-gnu
   mbswidth
+  non-recursive-gnulib-prefix-hack
   obstack
   obstack-printf
   perror progname
@@ -36,7 +36,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
@@ -46,9 +50,8 @@ gnulib_modules='
 XGETTEXT_OPTIONS=$XGETTEXT_OPTIONS'\\\
  --from-code=UTF-8\\\
  --flag=asprintf:2:c-format\\\
- --flag=complain:1:c-format --flag=complain_at:2:c-format\\\
- --flag=fatal:1:c-format --flag=fatal_at:2:c-format\\\
- --flag=warn:1:c-format  --flag=warn_at:2:c-format\\\
+ --flag=complain:3:c-format\\\
+ --flag=complain_indent:4:c-format\\\
  --flag=unexpected_end:2:c-format\\\
 '
 XGETTEXT_OPTIONS_RUNTIME=$XGETTEXT_OPTIONS'\\\
@@ -76,6 +79,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.
+  build-aux/prefix-gnulib-mk --lib-name=$gnulib_name lib/$gnulib_mk
+
   # Ensure that ChangeLog exists, for automake.
   test -f ChangeLog || touch ChangeLog
 }