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.

diff --git a/ChangeLog b/ChangeLog
index 0347b9fb3913214b82673e6478b0203d129ca9f7..9224704a45e5760c04fd8f6c45efe94344e72912 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2009-11-12  Jim Meyering  <meyering@redhat.com>
 
+       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 48cc10e47ea559212e4fdbda5abe0288740d2700..8ac13b2512344f2c52ce7da48c92355a2904a329 100755 (executable)
--- 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: