From: Jim Meyering <jim@meyering.net>
Date: Fri, 20 Nov 2009 13:30:57 +0000 (+0100)
Subject: build: make autogen.sh update .git-module-status, as it should
X-Git-Tag: 1.0.80~78
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=1b4bab6db252abcc3daab11159b0e45862c10b4c;p=libguestfs.git

build: make autogen.sh update .git-module-status, as it should

I ran autogen.sh, but then make was always failing like this:

    $ make
    cfg.mk:141: *** gnulib update required; run ./autogen.sh first.  Stop.

Here's the fix:

>From f743f32079fea2e8a17c7f5b59305e584c75dba0 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering@redhat.com>
Date: Fri, 20 Nov 2009 14:29:55 +0100
Subject: [PATCH libguestfs] build: make autogen.sh update .git-module-status, as it should

* autogen.sh: Without this, "make" would always say "gnulib update
required; run ./autogen.sh first", even after you'd run autogen.sh
successfully.
---

diff --git a/autogen.sh b/autogen.sh
index b31ec7b..cbb6da8 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -24,7 +24,7 @@ set -v
 # Ensure that whenever we pull in a gnulib update or otherwise change to a
 # different version (i.e., when switching branches), we also rerun ./bootstrap.
 curr_status=.git-module-status
-t=$(git submodule status)
+t=$(git submodule status|sed 's/.//;s/ .*//')
 if test "$t" = "$(cat $curr_status 2>/dev/null)"; then
     : # good, it's up to date
 else