Merge branch 'branch-2.6' into maint

[bison.git] / bootstrap.conf

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

-# Copyright (C) 2006, 2007 Free Software Foundation, Inc.
+# Copyright (C) 2006-2012 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,17 +17,27 @@
 
 # gnulib modules used by this package.
 gnulib_modules='
 
 # gnulib modules used by this package.
 gnulib_modules='

-       argmatch config-h c-strcase configmake
-       dirname error extensions fopen-safer
-       getopt gettext hash inttypes javacomp-script javaexec-script malloc
-       mbswidth obstack quote quotearg stdbool stpcpy strerror strtoul
-       strverscmp unistd unistd-safer unlocked-io verify xalloc xalloc-die
-       xstrndup
-'
+  argmatch assert calloc-posix close closeout config-h c-strcase
+  configmake
+  dirname
+  error extensions fdl fopen-safer getopt-gnu
+  gettext git-version-gen gitlog-to-changelog
+  gpl-3.0 hash inttypes isnan javacomp-script
+  javaexec-script ldexpl malloc-gnu mbschr mbsrchr
+  mbswidth
+  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
+  warnings
+  xalloc xalloc-die xmemdup0 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.
 '
 
 # Additional xgettext options to use.  Use "\\\newline" to break lines.


@@ -46,22 +56,40 @@ XGETTEXT_OPTIONS_RUNTIME=$XGETTEXT_OPTIONS'\\\
 # Gettext supplies these files, but we don't need them since
 # we don't have an intl subdirectory.
 excluded_files='
 # 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/glibc2.m4

-    m4/glibc21.m4

     m4/intdiv0.m4
     m4/intl.m4
     m4/intldir.m4
     m4/intmax.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/lcmessage.m4
     m4/lock.m4
     m4/longdouble.m4

-    m4/printf-posix.m4

     m4/signed.m4
     m4/signed.m4

-    m4/size_max.m4

     m4/uintmax_t.m4
     m4/ulonglong.m4
     m4/visibility.m4
     m4/uintmax_t.m4
     m4/ulonglong.m4
     m4/visibility.m4

-    m4/xsize.m4

 '
 '

+
+gnulib_tool_option_extras='--symlink --makefile-name=gnulib.mk'
+
+bootstrap_post_import_hook()
+{
+  # Ensure that ChangeLog exists, for automake.
+  test -f ChangeLog || touch ChangeLog
+}
+
+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]
+
+  perl -pi -e "s/\@PACKAGE\@/$package/g" README-release
+}
+
+# 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