tests: fix C++ conformance

[bison.git] / bootstrap.conf

diff --git a/bootstrap.conf b/bootstrap.conf
index 6cdb017c0502f495ec0b66c38f3de4ea70321c8a..6a5c9ae5e6156f1235f89e1d5ea0f8500c7d8b6e 100644 (file)
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -1,6 +1,6 @@
 # Bootstrap configuration.
 
 # Bootstrap configuration.
 

-# Copyright (C) 2006-2012 Free Software Foundation, Inc.
+# Copyright (C) 2006-2015 Free Software Foundation, Inc.

 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by


@@ -17,20 +17,25 @@
 
 # gnulib modules used by this package.
 gnulib_modules='
 
 # 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
   configmake
   dirname

-  do-release-commit-and-tag
-  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
   gettext git-version-gen gitlog-to-changelog
   gpl-3.0 hash inttypes isnan javacomp-script

-  javaexec-script ldexpl maintainer-makefile malloc-gnu
-  mbswidth obstack perror progname
+  javaexec-script ldexpl malloc-gnu
+  mbswidth
+  non-recursive-gnulib-prefix-hack
+  obstack
+  obstack-printf
+  perror progname

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

-  spawn-pipe stdbool stpcpy strdup-posix strerror strtoul strverscmp
-  unistd unistd-safer unlocked-io update-copyright unsetenv verify
+  spawn-pipe stdbool stpcpy strdup-posix strerror strverscmp
+  unistd unistd-safer unlink unlocked-io
+  update-copyright unsetenv verify

   warnings
   xalloc
   xalloc-die
   warnings
   xalloc
   xalloc-die


@@ -46,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'\\\


@@ -77,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