On 02/05/2011 03:39 PM, Eric Blake wrote: > On 02/05/2011 09:15 AM, Bruce Korb wrote: >> Hi Bruno, et al. I have merged the patch: >> http://lists.gnu.org/archive/html/bug-gnulib/2011-02/msg00044.html >> into the sources, yielding the patch below. Barring final testing >> problems or complaints, I am hoping to push later today. >> Thank you. Regards, Bruce > > This patch broke projects, yet it has no mention in NEWS how to fix > things. For example, upgrading m4.git to use the latest gnulib results in: > > $ make check > CDPATH="${ZSH_VERSION+.}:" && cd . && /bin/sh > /home/remote/eblake/m4-branch/build-aux/missing --run aclocal-1.11 -I m4 > cd . && /bin/sh /home/remote/eblake/m4-branch/build-aux/missing --run > automake-1.11 --gnu > lib/gnulib.mk:25: nodist_pkginclude_HEADERS must be set with `=' before > using `+=' > lib/Makefile.am:29: `lib/gnulib.mk' included from here > lib/gnulib.mk:26: EXTRA_HEADERS must be set with `=' before using `+=' > lib/Makefile.am:29: `lib/gnulib.mk' included from here > lib/gnulib.mk:1883: nobase_nodist_pkginclude_HEADERS must be set with > `=' before using `+=' > lib/Makefile.am:29: `lib/gnulib.mk' included from here > make: *** [Makefile.in] Error 1
M4 used gnulib-tool with the --makefile-name=gnulib.mk option (in order to write a shell Makefile.am that allows adding various -W options to CFLAGS during compilation of gnulib files). This patch was sufficient to get me going again: diff --git c/lib/Makefile.am w/lib/Makefile.am index 064edaf..41f46bf 100644 --- c/lib/Makefile.am +++ w/lib/Makefile.am @@ -20,10 +20,13 @@ BUILT_SOURCES = CLEANFILES = EXTRA_DIST = +EXTRA_HEADERS = MOSTLYCLEANDIRS = MOSTLYCLEANFILES = SUFFIXES = noinst_LIBRARIES = libm4.a +nobase_nodist_pkginclude_HEADERS = +nodist_pkginclude_HEADERS = include gnulib.mk -- Eric Blake [email protected] +1-801-349-2682 Libvirt virtualization library http://libvirt.org
signature.asc
Description: OpenPGP digital signature
