Version 2.4.1a.

[bison.git] / bootstrap.conf

diff --git a/bootstrap.conf b/bootstrap.conf
index f4b02b1c7fb5485314504d7f8b8d52a89c482464..0c421074aa2138bea64254e7ade8efd546ee4582 100644 (file)
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -1,34 +1,28 @@
 # Bootstrap configuration.
 
 # Bootstrap configuration.
 

-# Copyright (C) 2006 Free Software Foundation, Inc.
+# Copyright (C) 2006-2010 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 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
-'
-
-# Any gnulib files needed that are not in modules.
-gnulib_files='
-       m4/warning.m4
+  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 mbswidth obstack quote quotearg stdbool
+  stpcpy strerror strtoul strverscmp unistd unistd-safer unlocked-io
+  update-copyright unsetenv verify warnings xalloc xalloc-die xstrndup

 '
 
 # Additional xgettext options to use.  Use "\\\newline" to break lines.
 '
 
 # Additional xgettext options to use.  Use "\\\newline" to break lines.


@@ -40,6 +34,9 @@ XGETTEXT_OPTIONS=$XGETTEXT_OPTIONS'\\\
  --flag=warn:1:c-format  --flag=warn_at:2:c-format\\\
  --flag=unexpected_end:2:c-format\\\
 '
  --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.
 
 # Gettext supplies these files, but we don't need them since
 # we don't have an intl subdirectory.


@@ -48,6 +45,8 @@ excluded_files='
     m4/glibc2.m4
     m4/glibc21.m4
     m4/intdiv0.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/intmax.m4
     m4/inttypes_h.m4
     m4/lcmessage.m4


@@ -59,6 +58,9 @@ excluded_files='
     m4/uintmax_t.m4
     m4/ulonglong.m4
     m4/visibility.m4
     m4/uintmax_t.m4
     m4/ulonglong.m4
     m4/visibility.m4

-    m4/wint_t.m4

     m4/xsize.m4
 '
     m4/xsize.m4
 '

+
+# In directories like lib/, m4/, and po/, generate both these files because we
+# still try to support CVS emulation.
+vc_ignore='.cvsignore .gitignore'