build: manually update bootstrap from gnulib, and adapt

Updating to the latest bootstrap from gnulib involves more of a
change than usual, and updating to the latest gnulib would involve
its own set of challenges with the upcoming quoting changes, so
we update bootstrap manually and separately.
* bootstrap: Update from gnulib.
* lib/Makefile.am: Initialize more variables to empty, so that gnulib.mk
can append to them with "+=".
* bootstrap.conf (gnulib_mk_hook): Remove.  No longer honored.
(gnulib_tool_option_extras): Generate gnulib.mk.
(cherry picked from commit 85ad742d4e)

Conflicts:

	Makefile.am
	bootstrap.conf
	etc/prefix-gnulib-mk
This commit is contained in:
Jim Meyering
2012-01-16 12:29:19 +01:00
committed by Akim Demaille
parent 81c5003f91
commit ee7e9e3b66
3 changed files with 132 additions and 190 deletions

View File

@@ -72,4 +72,4 @@ bootstrap_epilogue()
# the bootstrap entry from the file .x-update-copyright, and add any
# needed copyright years to the copyright statement in the bootstrap
# script.
bootstrap_sync=true
# FIXME: temporary bootstrap_sync=true