* bootstrap (gnulib_extra_files): Remove announce-gen.

* bootstrap.conf (gnulib_modules): Add it here instead, now that
it's a module.

diff --git a/ChangeLog b/ChangeLog
index f8f9177..926d944 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2006-12-30  Jim Meyering  <jim@meyering.net>
 
+       * bootstrap (gnulib_extra_files): Remove announce-gen.
+       * bootstrap.conf (gnulib_modules): Add it here instead, now that
+       it's a module.
+
        * tests/misc/base64: Factor a long, repetitive string.
 
        * src/c99-to-c89.diff: Adjust remove.c offsets.

diff --git a/bootstrap b/bootstrap
index 19180fe..a5065aa 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -87,7 +87,6 @@ package=`sed -n "$extract_package_name" configure.ac` || exit
 
 # Extra files from gnulib, which override files from other sources.
 gnulib_extra_files='
-       build-aux/announce-gen
        build-aux/install-sh
        build-aux/missing
        build-aux/mdate-sh

diff --git a/bootstrap.conf b/bootstrap.conf
index 36a829b..41d925f 100644 (file)
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -37,7 +37,7 @@ obsolete_gnulib_modules='
 gnulib_modules="
        $avoided_gnulib_modules
        $obsolete_gnulib_modules
-       acl alloca argmatch assert backupfile base64 c-strtod
+       acl alloca announce-gen argmatch assert backupfile base64 c-strtod
        c-strtold calloc canon-host canonicalize chown cloexec
        config-h configmake
        closeout cycle-check d-ino d-type diacrit dirfd dirname dup2