Re: git version and automake 1.10b question

[Jim Meyering]

hggdh wrote:
...
> Thank you, both Eric and Andreas.
>
> I guess, then, it would be correct to update the references to
> automake in README-{prereq|hacking}, and to update bootstrap.conf.
>
> Patch attached. Please keep in mind this is my first one following the
> rules -- I may have made some mistakes. Also, I do not have a Fedora
> system, so I do not know if the instructions in README-prereq are
> correct in this regard.
>
> From 771fb4f10ea57b8797a37b2064e88df4630ae421 Mon Sep 17 00:00:00 2001
> From: C de-Avillez <address@hidden>
> Date: Wed, 1 Apr 2009 09:35:28 -0500
> Subject: [PATCH] updated prereqs to automake-1.10b or later. Changed 
> README-hacking,
>  README-prereq, and bootstrap.conf

Thanks. I've pushed the change below.
Small changes:
 - add newline after summary line in commit log
 - omit your README-hacking change, since 1.10a is new enough for xz
 - use a slightly modified ChangeLog style for commit log entries.
     That means "* FILE: description..." for each file changed.

As I write this, I realize that I should have mentioned
your addition of the "next"-tracking git checkout command
in the commit log.


>From 2ade7643de7a5d85a9c029dc6b6e06d339ec26e1 Mon Sep 17 00:00:00 2001
From: C de-Avillez <address@hidden>
Date: Wed, 1 Apr 2009 09:35:28 -0500
Subject: [PATCH] build: require automake-1.10b or newer

* bootstrap.conf: Require at least automake-1.10b.
* README-prereq: Mention 1.10b, not 1.10a.
---
 README-prereq  |   10 ++++++----
 bootstrap.conf |    2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/README-prereq b/README-prereq
index d65fe48..f6ff48e 100644
--- a/README-prereq
+++ b/README-prereq
@@ -16,16 +16,18 @@ getting the prerequisites for particular systems.
     # yum install emacs #autoconf build requires emacs (20MB)
     # rpmbuild --rebuild 
http://download.fedora.redhat.com/pub/fedora/linux/development/source/SRPMS/autoconf-2.63-1.fc10.src.rpm
     # rpm -Uvh /usr/src/redhat/RPMS/noarch/autoconf-2.63-1.fc8.noarch.rpm
-  Note Autoconf 2.61a-341 or newer is needed to build automake-1.10a in step 3.
+  Note Autoconf 2.61a-341 or newer is needed to build automake-1.10b in step 3.
   Apply the same method to install the lzma package.
   [FIXME: mention xz when it's packaged]

-  3. The latest released automake (1.10.1) was not new enough, so we download
-  and build automake-1.10a from its repository and make it available
+  3. The latest stable automake (1.10.1) was not new enough, so we download
+  and build automake-1.10b or newer from its repository and make it available
   just to coreutils:
     # yum install help2man #required to build automake fully
     $ git clone git://git.sv.gnu.org/automake.git
-    $ cd automake && ./configure --prefix=$HOME/coreutils/deps
+    $ cd automake
+    $ git checkout --track origin/next -b next
+    $ ./configure --prefix=$HOME/coreutils/deps
     $ make install

   Now we can build coreutils as described in README-hacking
diff --git a/bootstrap.conf b/bootstrap.conf
index 0747bb8..4baebb0 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -177,7 +177,7 @@ gnulib_tool_option_extras="--tests-base=$bt/gnulib-tests 
--with-tests"
 # Build prerequisites
 buildreq="\
 autoconf   2.61
-automake   1.10a
+automake   1.10b
 autopoint  -
 bison      -
 gettext    -
--
1.6.2.rc1.285.gc5f54