c++: style: use "unsigned", not "unsigned int"

[bison.git] / bootstrap.conf

diff --git a/bootstrap.conf b/bootstrap.conf
index 165d5e7d84675cbae6edc6dd123b2ba74f8ed596..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


@@ -20,21 +20,28 @@ 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
+  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 malloc-gnu mbschr mbsrchr
+  javaexec-script ldexpl malloc-gnu

   mbswidth
   mbswidth

+  non-recursive-gnulib-prefix-hack

   obstack
   obstack-printf
   perror progname
   quote quotearg
   readme-release
   realloc-posix
   obstack
   obstack-printf
   perror progname
   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
   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
 
   fprintf-posix printf-posix snprintf-posix sprintf-posix
   vsnprintf-posix vsprintf-posix


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


@@ -74,6 +80,9 @@ gnulib_tool_option_extras='--symlink --makefile-name=gnulib.mk'
 
 bootstrap_post_import_hook()
 {
 
 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
 }
   # Ensure that ChangeLog exists, for automake.
   test -f ChangeLog || touch ChangeLog
 }