diff options
| author | Kevin McCarthy <kevin@8t8.us> | 2021-02-07 18:27:47 -0800 |
|---|---|---|
| committer | Kevin McCarthy <kevin@8t8.us> | 2021-02-18 13:24:27 -0800 |
| commit | ccc18061461c025ee05754d4b9e8f94db2fdb233 (patch) | |
| tree | bb0a83be6f223a15f601f23f904f14e4ec8baad1 /crypt-gpgme.c | |
| parent | 9635fad4d93172df1c29b5814a47d7818c599f35 (diff) | |
Update gettext to version 0.21.
Run 'gettextize -f --no-changelog' to update to 0.21.
This removes the entire intl directory, and relies on an external
libintl only.
$(INTLLIBS) should now be referred to as $(LIBINTL), so change all
references.
Unfortunately, some of the gettext m4 files were modified and "mutt
customized" in the past. I'm trying to keep them in a pristine state
after this upgrade. glibc21.m4, lcmessage.m4, codeset.m4 have also
been removed.
Manually call AM_ICONV in configure.ac. This was previously called
in the modified "MUTT_AM_GNU_GETTEXT" but the result $am_cv_func_iconv
is tested just below.
locale.h is a standard library defined by C99. The gpgme and pgp code
wrapped those includes in HAVE_LOCALE_H checks, but that check was
performed inside of gettext.m4. Remove the check inside those
files (locale.h is already included unconditionally elsewhere in
Mutt).
Copy the sample gettext.h file and include that instead, as suggested
by the gettext documentation.
unistd.h is also a standard posix header, so remove HAVE_UNISTD_H
checks inside mutt too.
Create po/LINGUAS file listing available languages.
Create po/Makevars from the template and customize for Mutt.
Set PO_DEPENDS_ON_POT to no to prevent po file rebuilds. According to
the gettext manual, with this set, "PO files can be accidentally
updated even if a POT file is not updated" when using git.
Diffstat (limited to 'crypt-gpgme.c')
| -rw-r--r-- | crypt-gpgme.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/crypt-gpgme.c b/crypt-gpgme.c index 9f65c597..cf1d466c 100644 --- a/crypt-gpgme.c +++ b/crypt-gpgme.c @@ -46,9 +46,7 @@ #include <gpgme.h> -#ifdef HAVE_LOCALE_H #include <locale.h> -#endif #ifdef HAVE_LANGINFO_D_T_FMT #include <langinfo.h> #endif |