# HG changeset patch
# User Jim Meyering <meyering@redhat.com>
# Date 1258015779 -3600
# Node ID b8dd652dae800bfec058a4b2750b0de18b3e1e0d
# Parent  4758cd4c9683c498bb3201da9d963a2c532f7694
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
--- 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
--- a/build-aux/bootstrap
+++ b/build-aux/bootstrap
@@ -70,6 +70,10 @@
 # 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 @@
         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 @@
   fi
 fi
 
+bootstrap_epilogue
+
 echo "$0: done.  Now you can run './configure'."
 
 # Local Variables: