[Bug-vc-dwim] two patches just before release

[Jim Meyering]

I've just tagged version 1.2.
Before I could make the release, I had to make these two
small changes:

>From bfaa8ea35546bc286ce650c73ea2029cac02810d Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Tue, 8 Sep 2009 21:46:46 +0200
Subject: [PATCH 1/2] build: use gnulib's announce-gen module

* bootstrap.conf (gnulib_modules): Add announce-gen.
---
 ChangeLog      |    3 +++
 bootstrap.conf |    1 +
 2 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 46267c8..832c109 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2009-09-08  Jim Meyering  <address@hidden>

+       build: use gnulib's announce-gen module
+       * bootstrap.conf (gnulib_modules): Add announce-gen.
+
        build: update bootstrap from gnulib
        * bootstrap: Update from gnulib

diff --git a/bootstrap.conf b/bootstrap.conf
index d5feee1..7cf7474 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -25,6 +25,7 @@ avoided_gnulib_modules='
 # gnulib modules used by this package.
 gnulib_modules="
        $avoided_gnulib_modules
+       announce-gen
        extra-lib
        fdl
        git-version-gen
--
1.6.5.rc0.164.g5f6b0


>From 8ac44b43e3971cad3b85bb740fd80e1353760fc7 Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Tue, 8 Sep 2009 21:54:56 +0200
Subject: [PATCH 2/2] build: don't try to run autoheader, if we don't use it

* bootstrap: Define AUTOHEADER=true when AC_CONFIG_HEADERS is
not used in configure.ac.
---
 ChangeLog |    4 ++++
 bootstrap |    4 ++++
 2 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 832c109..449133e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2009-09-08  Jim Meyering  <address@hidden>

+       build: don't try to run autoheader, if we don't use it
+       * bootstrap: Define AUTOHEADER=true when AC_CONFIG_HEADERS is
+       not used in configure.ac.
+
        build: use gnulib's announce-gen module
        * bootstrap.conf (gnulib_modules): Add announce-gen.

diff --git a/bootstrap b/bootstrap
index b6dce12..8f14199 100755
--- a/bootstrap
+++ b/bootstrap
@@ -728,6 +728,10 @@ find "$m4_base" "$source_base" \

 # Reconfigure, getting other files.

+# Skip autoheader if it's not needed.
+grep '^[        ]*AC_CONFIG_HEADERS\>' configure.ac >/dev/null ||
+  AUTOHEADER=true
+
 for command in \
   libtool \
   "${ACLOCAL-aclocal} --force -I m4" \
--
1.6.5.rc0.164.g5f6b0