Handle more general types of option arguments.

[bison.git] / bootstrap.conf

diff --git a/bootstrap.conf b/bootstrap.conf
index 9904426d35312e1167f2dd508f4c21817ffab145..89d7db5d0e9b2ccd05854adf0538fb6a75d156cd 100644 (file)
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -1,30 +1,28 @@
 # Bootstrap configuration.
 
 # Bootstrap configuration.
 

-# Copyright (C) 2006, 2007 Free Software Foundation, Inc.
+# Copyright (C) 2006, 2007, 2008 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 javacomp-script javaexec-script malloc
-       mbswidth obstack quote quotearg stdbool stpcpy strcase strerror strtoul
-       strverscmp unistd unistd-safer unlocked-io verify xalloc xalloc-die
-       xstrndup
+       announce-gen argmatch config-h c-strcase configmake
+       dirname error extensions fopen-safer getopt gettext git-version-gen
+       gnumakefile hash inttypes javacomp-script javaexec-script malloc
+       mbswidth obstack quote quotearg stdbool stpcpy strerror strtoul
+       strverscmp unistd unistd-safer unlocked-io unsetenv verify xalloc
+       xalloc-die xstrndup

 '
 
 # Any gnulib files needed that are not in modules.
 '
 
 # Any gnulib files needed that are not in modules.


@@ -67,3 +65,7 @@ excluded_files='
     m4/visibility.m4
     m4/xsize.m4
 '
     m4/visibility.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'