variants: prohibit simple copies

[bison.git] / bootstrap.conf

diff --git a/bootstrap.conf b/bootstrap.conf
index cff387f98b94a16404b0ac565cecc64887e7713a..feff5ff0817f34e80c425aff4e09763f9615b10e 100644 (file)
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -20,11 +20,17 @@ gnulib_modules='
   argmatch assert calloc-posix close closeout config-h c-strcase
   configmake
   dirname
   argmatch assert calloc-posix close closeout config-h c-strcase
   configmake
   dirname

-  error extensions fdl fopen-safer getopt-gnu
+  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
   gettext git-version-gen gitlog-to-changelog
   gpl-3.0 hash inttypes isnan javacomp-script
   javaexec-script ldexpl malloc-gnu

-  mbswidth obstack perror progname
+  mbswidth
+  non-recursive-gnulib-prefix-hack
+  obstack
+  obstack-printf
+  perror progname

   quote quotearg
   readme-release
   realloc-posix
   quote quotearg
   readme-release
   realloc-posix


@@ -45,9 +51,8 @@ gnulib_modules='
 XGETTEXT_OPTIONS=$XGETTEXT_OPTIONS'\\\
  --from-code=UTF-8\\\
  --flag=asprintf:2:c-format\\\
 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'\\\
  --flag=unexpected_end:2:c-format\\\
 '
 XGETTEXT_OPTIONS_RUNTIME=$XGETTEXT_OPTIONS'\\\


@@ -76,7 +81,7 @@ 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.
 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
+  build-aux/prefix-gnulib-mk --lib-name=$gnulib_name lib/$gnulib_mk

 
   # Ensure that ChangeLog exists, for automake.
   test -f ChangeLog || touch ChangeLog
 
   # Ensure that ChangeLog exists, for automake.
   test -f ChangeLog || touch ChangeLog