On Fri, Oct 18, 2024 at 08:56:25PM +0100, Gavin Smith wrote: > On Fri, Oct 18, 2024 at 08:35:13PM +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've attempted to revert the change although it may not be enough as > you have made other changes involving gnulib and/or gettext at the > same time. > > Another commit was e8e2bdd718899e7c56ab9368, which didn't just remove > gettext files but had the major change of adding a "po" directory > underneath the gnulib directory. > > "git revert e8e2bdd718899e7c56ab9368" does not work due to many > conflicts. It is going to be more work to undo this.
tp/Texinfo/XS/gnulib/m4/gettext.m4 was added in commit 2cd1cfc788d207c, (Gavin Smith, 2019-03-17), as a result of running gettextize. Some of the confusion may come from the fact that gettextize places files in gnulib/m4 even though the files are not coming from gnulib. (Probably a result of having AC_CONFIG_MACRO_DIR([gnulib/m4]) in configure.ac.) Commit e8e2bdd718899e7c56ab9368 removed this file, and I have readded the newer version of this file by running "gettextize".
