[PATCH] bootstrap: sync from coreutils

[Jim Meyering]

FYI,

>From 9efa515cee4d1a40a41bdcd20e29932f8e2e5102 Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Thu, 12 Nov 2009 09:49:39 +0100
Subject: [PATCH] bootstrap: sync from coreutils

* build-aux/bootstrap (bootstrap_epilogue): New function.
Use git_modules_config in one more place.  This make bootstrap's
--gnulib-srcdir option more useful for testing.
---
 ChangeLog           |    5 +++++
 build-aux/bootstrap |    8 +++++++-
 2 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0347b9f..9224704 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2009-11-12  Jim Meyering  <address@hidden>

+       bootstrap: sync from coreutils
+       * build-aux/bootstrap (bootstrap_epilogue): New function.
+       Use git_modules_config in one more place.  This make bootstrap's
+       --gnulib-srcdir option more useful for testing.
+
        bootstrap: generalize autoheader check
        * build-aux/bootstrap: Look for AC_CONFIG_HEADER as well as
        AC_CONFIG_HEADERS.
diff --git a/build-aux/bootstrap b/build-aux/bootstrap
index 48cc10e..8ac13b2 100755
--- a/build-aux/bootstrap
+++ b/build-aux/bootstrap
@@ -70,6 +70,10 @@ gnulib_modules=
 # Any gnulib files needed that are not in modules.
 gnulib_files=

+# A function to be called after everything else in this script.
+# Override it via your own definition in bootstrap.conf.
+bootstrap_epilogue() { :; }
+
 # The command to download all .po files for a specified domain into
 # a specified directory.  Fill in the first %s is the domain name, and
 # the second with the destination directory.  Use rsync's -L and -r
@@ -413,7 +417,7 @@ case ${GNULIB_SRCDIR--} in
         git_modules_config submodule.gnulib.url >/dev/null; then
     git submodule init
     GNULIB_SRCDIR=`cd $GNULIB_SRCDIR && pwd`
-    git config --replace-all submodule.gnulib.url $GNULIB_SRCDIR
+    git_modules_config --replace-all submodule.gnulib.url $GNULIB_SRCDIR
     echo "$0: getting gnulib files..."
     git submodule update || exit $?
     GNULIB_SRCDIR=gnulib
@@ -800,6 +804,8 @@ if test $with_gettext = yes; then
   fi
 fi

+bootstrap_epilogue
+
 echo "$0: done.  Now you can run './configure'."

 # Local Variables:
--
1.6.5.2.372.gc0502