Hi Everyone,

TL;DR:
I've had on my todo list for a while to dig into the gettext autoconf stuff and see if I could upgrade it. I've pushed the result to branch 'kevin/gettext-update' on gitlab (or sr.ht). If you have a chance, please give the branch a test.

Details:
The update is the result of running "gettextize -f --no-changelog" and then cleaning things up:

- The latest version doesn't have a "bundled" option, so this removed the intl directory and --with-included-gettext configure option.

- I've kept the added m4 files unmodified. The old versions seemed to be slightly modified. I've documented the "owner" of each m4 file in m4/README, to make it easier to keep track of what all the stuff in there is for.

- configure.ac now calls:
  AM_GNU_GETTEXT([external])
  AM_ICONV
It previously called MUTT_AM_GNU_GETTEXT, which had an MUTT_AM_ICONV inside of it.

- I've looked through the old gettext.m4 and other files, to see if I missed some important checks. I don't believe any of the checks there were missing from configure.ac.

- A few places in the Mutt code had:
    #ifdef HAVE_LOCALE_H
    #include <locale.h>
    #endif
The HAVE_LOCALE_H was from the old gettext.m4 file. Since locale.h is a standard C99 header, and was *already* used elsewhere in Mutt without
the #ifdef, I've pulled the #ifdef out.

- Likewise for:
  #ifdef HAVE_UNISTD_H
  #include <unistd.h>
  #endif

- The gettextize recommended including a copy of their "gettext.h" instead of directly <libintl.h>, so I've made that change in lib.h. If anyone believes this is a bad idea, please let me know. It's easy enough to just keep the <libintl.h> include instead.

- I've added a po/LINGUAS file with the existing po files.

- I've used their template to create a po/Makevars file.

If you have any problems, or see something I missed, please let me know. Thank you!

--
Kevin J. McCarthy
GPG Fingerprint: 8975 A9B3 3AA3 7910 385C  5308 ADEF 7684 8031 6BDA

Attachment: signature.asc
Description: PGP signature

Reply via email to