On Fri, Oct 18, 2024 at 08:35:11PM +0100, Gavin Smith wrote: > On Sun, Oct 06, 2024 at 07:45:20PM +0200, Patrice Dumas wrote: > > Hello, > > > > I removed some gettext macros installed by gnulib or gettextize in 2021 > > when updating gnulib (when I updated the setup of the gnulib po > > directories), in this commit (there is a similar one for tp/Texinfo/XS > > gnulib): > > https://git.savannah.gnu.org/cgit/texinfo.git/commit/?id=a46d1f492047615340fc3a5630632aad32bdb8e3 > > > > Now the gettext macros are directly in aclocal.m4. > > Removing gettext.m4 was a mistake, as far as I can tell.
I am not surprised. When I changed how gnulib po files were handled, I ran into issues with gettext compatibility. It seemed to me that the gettext.m4 file was from gnulib, but it had been removed from gnulib in the mean time, and so was not updated when updating gnulib. So I removed all the files that seemed to be associated to the removed gnulib code. As you say in another mail, I was mistaken here because the m4 files actually come from gettext. > As aclocal.m4 is a file generated by aclocal, it is not enough to have > a copy of the gettext macros there. (aclocal.m4 is not even tracked in git). > We should keep copies of all of the *.m4 files that are needed, as > for the other files in gnulib/m4. This is very confusing to me to have the .m4 coming from gettext in gnulib/m4. > If I "rm aclocal.m4" and then run "./autogen.sh", then aclocal.m4 is > recreated with a copy of gettext.m4 inside it (which on my system, is > copied from /usr/share/aclocal/gettext.m4 - coincidentally, it is for > the correct version). > > Evidently on the Solaris CI machine, a different, incompatible version > of gettext.m4 is the one being pulled in. Ok. -- Pat
