Re: make gnulib a git submodule

[Eric Blake]

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

According to Eric Blake on 3/19/2009 6:50 AM:
> What do you think of this follow-on patch?  Since we guarantee gnulib as a
> git submodule, we can use git symlinks to point into that submodule, and
> automatically pick up the latest build-aux scripts by merely updating the
> submodule, rather than having to rerun bootstrap!

Although, when you do rerun bootstrap, invoking 'autoreconf --force' undid
all that work.  I'm checking in this followup, as part of porting it to
branch-1.6 and master.

- --
Don't work too hard, make some time for fun as well!

Eric Blake             address@hidden
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Public key at home.comcast.net/~ericblake/eblake.gpg
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAknIOwkACgkQ84KuGfSFAYACLgCgjJ/LP+tdIcAakcSp+wRFXw5o
wrUAoJDyXvCPdeGTAUkmgKqTU7Hx1U91
=OKNp
-----END PGP SIGNATURE-----

>From dcf9af31d5ffb69054b2ea63be638cb11041c43d Mon Sep 17 00:00:00 2001
From: Eric Blake <address@hidden>
Date: Mon, 23 Mar 2009 11:30:49 -0600
Subject: [PATCH] Don't force file overwrites during bootstrap.

* bootstrap: Ensure that rerunning bootstrap doesn't alter tree.

Signed-off-by: Eric Blake <address@hidden>
---
 ChangeLog |    3 +++
 bootstrap |    6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a681aae..b485138 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2009-03-23  Eric Blake  <address@hidden>

+       Don't force file overwrites during bootstrap.
+       * bootstrap: Ensure that rerunning bootstrap doesn't alter tree.
+
        Drop dist-lzma, now that xz replaces lzma.
        * configure.ac (AM_INIT_AUTOMAKE): Drop dist-lzma.  Until a stable
        automake release includes dist-xz, the release process will just
diff --git a/bootstrap b/bootstrap
index 2167f3f..e9c8200 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,6 +1,6 @@
 #! /bin/sh

-# bootstrap (GNU M4) version 2009-03-18
+# bootstrap (GNU M4) version 2009-03-23
 # Written by Gary V. Vaughan  <address@hidden>

 # Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Free Software
@@ -291,8 +291,8 @@ $CONFIG_SHELL gnulib/gnulib-tool --update \
 ## Autoreconf. ##
 ## ----------- ##

-func_echo "running: $AUTORECONF --force --verbose --install"
-$AUTORECONF --force --verbose --install || func_fatal_error "autoreconf failed"
+func_echo "running: $AUTORECONF --verbose --install"
+$AUTORECONF --verbose --install || func_fatal_error "autoreconf failed"

 exit 0

-- 
1.6.1.2