From: Jim Meyering <meyering@redhat.com>
Date: Thu, 19 Jan 2012 05:14:31 +0000 (+0100)
Subject: bootstrap: add bootstrap_post_import_hook
X-Git-Tag: v0.1~1233
X-Git-Url: http://erislabs.net/gitweb/?p=gnulib.git;a=commitdiff_plain;h=44c4f75581a7774594e5a225ab43c9c211e4abb4

bootstrap: add bootstrap_post_import_hook

Bison does still need something like the gnulib_mk_hook whose
invocation I had to remove along with slurp in commit 767ccd40.
Technically, we could get along without it, but doing so would
have required living with a warning and a mandatory post-bootstrap
automake rerun.
* build-aux/bootstrap (gnulib_mk_hook): Remove definition, too.
(bootstrap_post_import_hook): New function.
Invoke it after gnulib-tool --import and before autoreconf.
---

diff --git a/ChangeLog b/ChangeLog
index dc34bb544..07c8a13e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2012-01-19  Jim Meyering  <meyering@redhat.com>
+
+	bootstrap: add bootstrap_post_import_hook
+	Bison does still need something like the gnulib_mk_hook whose
+	invocation I had to remove along with slurp in commit 767ccd40.
+	Technically, we could get along without it, but doing so would
+	have required living with a warning and a mandatory post-bootstrap
+	automake rerun.
+	* build-aux/bootstrap (gnulib_mk_hook): Remove definition, too.
+	(bootstrap_post_import_hook): New function.
+	Invoke it after gnulib-tool --import and before autoreconf.
+
 2012-01-18  Jim Meyering  <meyering@redhat.com>
 
 	gitlog-to-changelog: don't use "no_"-prefixed variable name
diff --git a/build-aux/bootstrap b/build-aux/bootstrap
index 13ec5aee5..57202fa6a 100755
--- a/build-aux/bootstrap
+++ b/build-aux/bootstrap
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Print a version string.
-scriptversion=2012-01-16.20; # UTC
+scriptversion=2012-01-18.21; # UTC
 
 # Bootstrap this package from checked-out sources.
 
@@ -87,9 +87,9 @@ gnulib_files=
 : ${AUTOPOINT=autopoint}
 : ${AUTORECONF=autoreconf}
 
-# A function to be called to edit gnulib.mk right after it's created.
+# A function to be called right after gnulib-tool is run.
 # Override it via your own definition in bootstrap.conf.
-gnulib_mk_hook() { :; }
+bootstrap_post_import_hook() { :; }
 
 # A function to be called after everything else in this script.
 # Override it via your own definition in bootstrap.conf.
@@ -807,6 +807,8 @@ for file in $gnulib_files; do
   symlink_to_dir "$GNULIB_SRCDIR" $file || exit
 done
 
+bootstrap_post_import_hook
+
 # Remove any dangling symlink matching "*.m4" or "*.[ch]" in some
 # gnulib-populated directories.  Such .m4 files would cause aclocal to fail.
 # The following requires GNU find 4.2.3 or newer.  Considering the usual