> Is there any option in gnulib that would allow to inject
> GETTEXT_CPPFLAGS into the gnulib makefiles, or any other possibility
> to fix this?
Fortunately, I know how to fix that - it involves changing our
gnulib-tool to spit out gnulib.mk to be included from a wrapper
Makefile.am that we manage, rather than our current practice of letting
gnulib-tool spit out the complete Makefile.am (coreutils.git does the
same thing).
I attached a preliminary patch.
I'll submit a v2 based on your patch shortly.