* NEWS (2.5): Fix minor typos.

[bison.git] / bootstrap.conf

diff --git a/bootstrap.conf b/bootstrap.conf
index f4b02b1c7fb5485314504d7f8b8d52a89c482464..2de61cb5fb2917d0784707cf474d5524985c6eed 100644 (file)
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -1,34 +1,32 @@
 # Bootstrap configuration.
 
-# Copyright (C) 2006 Free Software Foundation, Inc.
+# Copyright (C) 2006-2011 Free Software Foundation, Inc.
 
-# This program is free software; you can redistribute it and/or modify
+# 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
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-
+#
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
-
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # gnulib modules used by this package.
 gnulib_modules='
-       argmatch configmake dirname error extensions fopen-safer
-       getopt gettext hash inttypes malloc mbswidth obstack quote
-       quotearg stdbool stpcpy strerror strtoul strverscmp unistd
-       unistd-safer unlocked-io verify xalloc xalloc-die xstrndup
-'
+  announce-gen argmatch assert config-h c-strcase configmake dirname
+  error extensions fopen-safer gendocs getopt-gnu gettext
+  git-version-gen hash inttypes javacomp-script javaexec-script
+  maintainer-makefile malloc-gnu mbswidth obstack quote quotearg
+  realloc-posix spawn-pipe stdbool stpcpy strerror strtoul strverscmp unistd
+  unistd-safer unlocked-io update-copyright unsetenv verify warnings
+  xalloc xalloc-die xstrndup
 
-# Any gnulib files needed that are not in modules.
-gnulib_files='
-       m4/warning.m4
+  fprintf-posix printf-posix snprintf-posix sprintf-posix
+  vsnprintf-posix vsprintf-posix
 '
 
 # Additional xgettext options to use.  Use "\\\newline" to break lines.
@@ -40,25 +38,43 @@ XGETTEXT_OPTIONS=$XGETTEXT_OPTIONS'\\\
  --flag=warn:1:c-format  --flag=warn_at:2:c-format\\\
  --flag=unexpected_end:2:c-format\\\
 '
+XGETTEXT_OPTIONS_RUNTIME=$XGETTEXT_OPTIONS'\\\
+ --keyword=YY_ \\\
+'
 
 # Gettext supplies these files, but we don't need them since
 # we don't have an intl subdirectory.
 excluded_files='
-    m4/codeset.m4
     m4/glibc2.m4
-    m4/glibc21.m4
     m4/intdiv0.m4
+    m4/intl.m4
+    m4/intldir.m4
     m4/intmax.m4
-    m4/inttypes_h.m4
     m4/lcmessage.m4
     m4/lock.m4
     m4/longdouble.m4
-    m4/printf-posix.m4
     m4/signed.m4
-    m4/size_max.m4
     m4/uintmax_t.m4
     m4/ulonglong.m4
     m4/visibility.m4
-    m4/wint_t.m4
-    m4/xsize.m4
 '
+
+# Massage lib/gnulib.mk before using it later in the bootstrapping process.
+gnulib_mk_hook()
+{
+  etc/prefix-gnulib-mk $1
+}
+
+bootstrap_epilogue()
+{
+  # Make sure we don't need src/bison, which usually doesn't exist at
+  # the time of a bootstrap.
+  touch src/parse-gram.[ch]
+}
+
+# Keep our bootstrap script in sync with gnulib's.  If we ever need to
+# maintain our own bootstrap script again, set this to false, remove
+# the bootstrap entry from the file .x-update-copyright, and add any
+# needed copyright years to the copyright statement in the bootstrap
+# script.
+bootstrap_sync=true