portability: fix several issues with M4 subprocess.

[bison.git] / bootstrap.conf

diff --git a/bootstrap.conf b/bootstrap.conf
index 669777c65305772fd2c5622a6a6455225a3fdf1d..b14cabd66641ac471f1f5106a6a5cb58b6f7e129 100644 (file)
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -1,6 +1,6 @@
 # Bootstrap configuration.
 
-# Copyright (C) 2006, 2007, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2006-2010 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
@@ -17,17 +17,16 @@
 
 # gnulib modules used by this package.
 gnulib_modules='
-       argmatch config-h c-strcase configmake
-       dirname error extensions fopen-safer git-version-gen
-       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
-'
+  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 pipe quote quotearg
+  realloc-posix 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.
@@ -57,7 +56,6 @@ excluded_files='
     m4/lcmessage.m4
     m4/lock.m4
     m4/longdouble.m4
-    m4/printf-posix.m4
     m4/signed.m4
     m4/size_max.m4
     m4/uintmax_t.m4
@@ -65,3 +63,7 @@ excluded_files='
     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'