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. 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. 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. > This seems to have lead to the following failure in the opencsw Solaris CI: > > *** error: gettext infrastructure mismatch: using a Makefile.in.in from > gettext version 0.20 but the autoconf macros are from gettext version 0.19 > > I think that it is because the autoconf macros come from the Solaris, > which are pretty old, while the Makefile.in.in come from GNU Texinfo > git. The Makefile.in.in are not that new, they where generated in 2021, > but still too new for the Solaris/opencsw tools. > > I may have missed something. > > Does anybody have a comment/recommendation on that subject? > > -- > Pat >