On 17 December 2013 10:02, Benno Schulenberg <bensberg@xxxxxxxxxxxxx> wrote: > Attached is a patch that should add the option --no-wrap to the runs > of msgmerge (after a renewal of the POT file) to reduce the number > of spurious differences. > > However, I can't get the thing to work here. When i run autogen.sh > it says "Copying file po/Makefile.in.in", and when I then look in that > file it mentions "# Origin: gettext-0.14". But the only Makefile.in.in > I have on this testing system is /usr/share/gettext/po/Makefile.in.in > and in that file it says "# Origin: gettext-0.18". (That version is needed, > otherwise it doesn't know the MSGMERGE_OPTIONS variable.) > > So... where does autogen.sh/autopoint take its Makefile.in.in from? Hi Benno, I think the change should include configure.ac update to require gettext version 0.18. -- snip diff --git a/configure.ac b/configure.ac index 8665780..5444cd3 100644 --- a/configure.ac +++ b/configure.ac @@ -145,7 +145,7 @@ UL_SET_ARCH([HPPA], [hppa*]) AC_SYS_LARGEFILE -AM_GNU_GETTEXT_VERSION([0.14.1]) +AM_GNU_GETTEXT_VERSION([0.18]) AM_GNU_GETTEXT([external]) AS_IF([test -d "$srcdir/po"], [ -- snip Feel free to add when resubmitting. Acked-by: Sami Kerola <kerolasa@xxxxxx> -- Sami Kerola http://www.iki.fi/kerolasa/ -- To unsubscribe from this list: send the line "unsubscribe util-linux" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
