Libguestfs - Aug 2009 - [PATCH libguestfs 1/2] build: invoke autopoint and autoreconf with --force

The last patch was incomplete, since autoreconf must also be
run with -f/--force.

This change also updates the gnulib submodule to the latest,
in order to pull in the progname change I made yesterday
to give sensible names in diagnostics like this one:

    $ ./guestfish --version > /dev/full
    guestfish: write error: No space left on device

Once the second change is pushed, you will have to run autogen.sh,
which will automatically rerun bootstrap to re-sync the gnulib/*
bits from the updated .gnulib repository.
>From a64c926f14cc5b287ab10039fe5be1521c3183e1 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering at redhat.com>
Date: Tue, 25 Aug 2009 09:10:21 +0200
Subject: [PATCH libguestfs 1/2] build: invoke autopoint and autoreconf with
--force

* bootstrap: Invoke autopoint with --force, to avoid warning
about existing build-aux/config.rpath.
* autogen.sh: Invoke autoreconf with --force, too.
---
 autogen.sh |    2 +-
 bootstrap  |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index 5179623..f2e128f 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -33,7 +33,7 @@ else
 fi

 mkdir -p daemon/m4
-autoreconf -i
+autoreconf -i -f

 CONFIGUREDIR=.

diff --git a/bootstrap b/bootstrap
index 2eba6a7..85afda8 100755
--- a/bootstrap
+++ b/bootstrap
@@ -29,7 +29,7 @@ GNULIB_SRCDIR=.gnulib
 ls po/*.po 2>/dev/null | sed 's|.*/||; s|\.po$||' > po/LINGUAS

 # Run autopoint, to get po/Makevars.template:
-autopoint
+autopoint -f

 # Create gettext configuration.
 echo "$0: Creating po/Makevars from po/Makevars.template ..."
--
1.6.4.1.322.g38eb7

>From 5e0007337cc17a67b5f3de56b15673dcda7f7813 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering at redhat.com>
Date: Tue, 25 Aug 2009 09:43:04 +0200
Subject: [PATCH libguestfs 2/2] build: update gnulib submodule to latest

* .gnulib: Update to latest.
---
 .gnulib |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/.gnulib b/.gnulib
index 7560950..52dec75 160000
--- a/.gnulib
+++ b/.gnulib
@@ -1 +1 @@
-Subproject commit 7560950d6efd9e209b8d7188e1a95ceb53035889
+Subproject commit 52dec75be71b6526bb42610f74beb013cb27f1f3
--
1.6.4.1.322.g38eb7

On 25/08/09 09:05, Jim Meyering wrote:
> The last patch was incomplete, since autoreconf must also be
> run with -f/--force.
This was certainly required to allow me to build from scratch. Why are 
these forces necessary where they weren't before? Are there any 
disadvantages to using force here? If so, is there any way to avoid it?

Matt
-- 
Matthew Booth, RHCA, RHCSS
Red Hat Engineering, Virtualisation Team

M:       +44 (0)7977 267231
GPG ID:  D33C3490
GPG FPR: 3733 612D 2D05 5458 8A8A 1600 3441 EA19 D33C 3490