From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 8 Nov 2006 20:41:55 +0000 (+0000)
Subject: * bootstrap.conf (excluded_files): Exclude m4/codeset.m4 (undoing
X-Git-Tag: v2.3b~245
X-Git-Url: https://git.saurik.com/bison.git/commitdiff_plain/7746c8f63d39afab7f52e0e7b701060d7770333a?ds=sidebyside

* bootstrap.conf (excluded_files): Exclude m4/codeset.m4 (undoing
the earlier change today), m4/intl.m4, m4/intldir.m4.  This gives
us a slightly cleaner distribution, and also works.
* m4/.cvsignore: Add inline.m4, wint_t.m4 to accommodate recent
gnulib changes.
---

diff --git a/ChangeLog b/ChangeLog
index 451c9d00..f143b6e8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-11-08  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* bootstrap.conf (excluded_files): Exclude m4/codeset.m4 (undoing
+	the earlier change today), m4/intl.m4, m4/intldir.m4.  This gives
+	us a slightly cleaner distribution, and also works.
+	* m4/.cvsignore: Add inline.m4, wint_t.m4 to accommodate recent
+	gnulib changes.
+
 2006-11-08  Joel E. Denny  <jdenny@ces.clemson.edu>
 	and Paul Eggert  <eggert@cs.ucla.edu>
 
diff --git a/bootstrap.conf b/bootstrap.conf
index 0bc4e54e..f4fe8d5b 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -47,9 +47,12 @@ 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='
+    m4/codeset.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
diff --git a/m4/.cvsignore b/m4/.cvsignore
index 40a549f8..228c13a1 100644
--- a/m4/.cvsignore
+++ b/m4/.cvsignore
@@ -14,6 +14,7 @@ gnulib-comp.m4
 gnulib-tool.m4
 hash.m4
 iconv.m4
+inline.m4
 inttypes-h.m4
 inttypes-pri.m4
 inttypes.m4
@@ -46,5 +47,6 @@ unlocked-io.m4
 warning.m4
 wchar_t.m4
 wcwidth.m4
+wint_t.m4
 xalloc.m4
 xstrndup.m4