build: generalize etc/prefix-gnulib-mk

[bison.git] / bootstrap.conf

diff --git a/bootstrap.conf b/bootstrap.conf
index 0bc4e54e2d9b22aacf7bcfe35819bc7abe74eca9..599b778f0eb26a5420ec98a1b478f8ae70e2d6c5 100644 (file)
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -1,34 +1,34 @@
 # Bootstrap configuration.
 
 # Bootstrap configuration.
 

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

-       argmatch config-h 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 calloc-posix close config-h c-strcase
+  configmake dirname error extensions fdl fopen-safer gendocs getopt-gnu
+  gettext git-version-gen gitlog-to-changelog
+  gpl-3.0 hash inttypes isnan javacomp-script
+  javaexec-script ldexpl maintainer-makefile malloc-gnu mbschr mbsrchr
+  mbswidth obstack perror pipe-posix quote quotearg realloc-posix
+  spawn-pipe stdbool stpcpy strdup-posix 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.
 '
 
 # Additional xgettext options to use.  Use "\\\newline" to break lines.


@@ -48,18 +48,40 @@ XGETTEXT_OPTIONS_RUNTIME=$XGETTEXT_OPTIONS'\\\
 # we don't have an intl subdirectory.
 excluded_files='
     m4/glibc2.m4
 # we don't have an intl subdirectory.
 excluded_files='
     m4/glibc2.m4

-    m4/glibc21.m4

     m4/intdiv0.m4
     m4/intdiv0.m4

+    m4/intl.m4
+    m4/intldir.m4

     m4/intmax.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()
+{
+  # Massage lib/gnulib.mk before using it later in the bootstrapping process.
+  etc/prefix-gnulib-mk --lib-name=$gnulib_name lib/$gnulib_mk
+
+  # 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]
+}
+
+# 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.
+# FIXME: temporary bootstrap_sync=true