On Tue, Aug 06, 2024 at 10:20:28PM +0100, Gavin Smith wrote: > On Tue, Aug 06, 2024 at 09:45:25AM +0200, Bruno Haible wrote: > > The fix to the problem is > > 1) To apply the attached patch. Both the main configure.ac and > > tp/Texinfo/XS/configure.ac use the same po/ directory. Since the > > version > > of the gettext.m4 and related files must be in sync with the > > Makefile.in.in > > in the po/ directory, we have the constraint that the gettext > > infrastructure > > of both directories must be of the same version. > > 2) In the tp/Texinfo/XS/ directory, run the command > > autopoint -f; rm -rf po > > and revert the changes of gnulib/m4/*.m4 files that downgrade from a > > newer > > serial number (from gnulib) to an older serial number (from gettext). > > You need to do this manually, because the autogen.sh does not do it. > > Unfortunately, there is an overlap between files brought in by > > autopoint > > and gnulib, and while it is OK to use newer versions (from gnulib) > > instead > > of older versions (from gettext), a downgrade is not recommended. > > 3) Commit the file tp/Texinfo/XS/gnulib/m4/intlmacosx.m4 under version > > control, > > like the gettext.m4 file in the same directory. > > > > Bruno > > I've followed these instructions and made the commits.
I am remaking these commits again after reverting them, but there is another problem. The "autogen.sh" script at the root of the Texinfo repository runs autoreconf under tp/Texinfo/XS. Now it runs autopoint: $ autoreconf --force --verbose --install autoreconf: export WARNINGS= autoreconf: Entering directory '.' autoreconf: running: autopoint --force Copying file config.rpath Copying file gnulib/m4/gettext.m4 Copying file gnulib/m4/host-cpu-c-abi.m4 Copying file gnulib/m4/iconv.m4 Copying file gnulib/m4/lib-ld.m4 Copying file gnulib/m4/lib-link.m4 Copying file gnulib/m4/lib-prefix.m4 ... This is due to the use of AM_GNU_GETTEXT_VERSION that has been added to tp/Texinfo/XS/configure, which autoreconf scans for. Some of these copied files are downgrades. I can change autogen.sh to avoid these downgrades. There is already a comment in autogen.sh to explain why autoreconf is not run at the top level.
