* 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 451c9d00d7329f8985c3ab7afdfd25ffca6d061f..f143b6e8c42764d399a5e46007ad62e98612c65d 100644 (file)
--- 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>
 
 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 0bc4e54e2d9b22aacf7bcfe35819bc7abe74eca9..f4fe8d5b22bf9e12438d161a8a28f0e52362f02c 100644 (file)
--- 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='
 # 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/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

diff --git a/m4/.cvsignore b/m4/.cvsignore
index 40a549f8c51f689eca8953fbc336a7389d6ec2a8..228c13a1e40bd4fe1244b1e9d811aa55bcaa7a4f 100644 (file)
--- a/m4/.cvsignore
+++ b/m4/.cvsignore
@@ -14,6 +14,7 @@ gnulib-comp.m4
 gnulib-tool.m4
 hash.m4
 iconv.m4
 gnulib-tool.m4
 hash.m4
 iconv.m4

+inline.m4

 inttypes-h.m4
 inttypes-pri.m4
 inttypes.m4
 inttypes-h.m4
 inttypes-pri.m4
 inttypes.m4


@@ -46,5 +47,6 @@ unlocked-io.m4
 warning.m4
 wchar_t.m4
 wcwidth.m4
 warning.m4
 wchar_t.m4
 wcwidth.m4

+wint_t.m4

 xalloc.m4
 xstrndup.m4
 xalloc.m4
 xstrndup.m4