Re: git version and automake 1.10b question

[hggdh]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On Wed, 01 Apr 2009 08:01:57 -0600
Eric Blake <address@hidden> wrote:
 
> automake.git has multiple branches.  Right now, the master branch is
> stuck at 1.10a, but Ralf will be fixing that in the future.  But the
> next branch is at 1.10c (post-release).  You probably want to do:
> 
> $ git checkout --track origin/next -b next
> 
> then rerun ./bootstrap to build automake 1.10c.
> 

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

- ---
 README-hacking |    2 +-
 README-prereq  |    8 +++++---
 bootstrap.conf |    2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/README-hacking b/README-hacking
index 668d8d9..ac79fa6 100644
- --- a/README-hacking
+++ b/README-hacking
@@ -35,7 +35,7 @@ Valgrind supports your architecture. See also README-valgrind.
 
 This package's build procedure uses XZ to create a compressed
 distribution tarball.  Using this feature of Automake requires
- -version 1.10a or newer, as well as the xz program itself.
+version 1.10b or newer, as well as the xz program itself.
 Make sure you have the latest version of the XZ Utils from
 <http://tukaani.org/lzma/download>.
 
diff --git a/README-prereq b/README-prereq
index d65fe48..2b56c90 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
+  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.0.4


-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)

iEYEARECAAYFAknTfcEACgkQfbrzscpaDCDrDACgsM8hXPxEYnmLrXo32iBL/ddE
qQAAn2QH/EtGeoLr4gHDYPNQzeL7wXZD
=giQU
-----END PGP SIGNATURE-----