From 01b6fb98bf0f62a042afb236c0aa892c627e0632 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Fri, 11 Aug 2006 21:39:36 +0000 Subject: [PATCH] * bootstrap: Set XGETTEXT_OPTIONS to flag our printf-format functions, so that translators are warned about strings that are formats but don't look like formats. This might help prevent core dumps. * configure.ac (AM_GNU_GETTEXT): Upgrade to need-formatstring-macros. Suggested by Eric Blake to avoid problems like . (AM_GNU_GETTEXT_VERSION): Upgrade from 0.12.1 to 0.15. The gettext manual says we should use the version number normally expected of maintainers, neither more nor less. --- ChangeLog | 10 ++++++++++ bootstrap | 23 +++++++++++++++++++---- configure.ac | 4 ++-- 3 files changed, 31 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index db04d62..035e408 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,15 @@ 2006-08-11 Paul Eggert + * bootstrap: Set XGETTEXT_OPTIONS to flag our printf-format functions, + so that translators are warned about strings that are formats but + don't look like formats. This might help prevent core dumps. + * configure.ac (AM_GNU_GETTEXT): Upgrade to need-formatstring-macros. + Suggested by Eric Blake to avoid problems like + . + (AM_GNU_GETTEXT_VERSION): Upgrade from 0.12.1 to 0.15. The gettext + manual says we should use the version number normally expected of + maintainers, neither more nor less. + * bootstrap (get_translations): Don't exclude ky.po; it is working again. diff --git a/bootstrap b/bootstrap index e23eb0f..57307df 100755 --- a/bootstrap +++ b/bootstrap @@ -403,10 +403,25 @@ do done -# Put bug-reporting address into po/Makevars. -echo "$0: sed '/^MSGID_BUGS_ADDRESS *=/s/=.*/= bug-$package@gnu.org/' po/Makevars.template >po/Makevars ..." -sed '/^MSGID_BUGS_ADDRESS *=/s/=.*/= bug-'"$package"'@gnu.org/' po/Makevars.template >po/Makevars - +# Create gettext configuration. +echo "$0: Creating po/Makevars from po/Makevars.template ..." +sed ' + /^MSGID_BUGS_ADDRESS *=/s/=.*/= bug-'"$package"'@gnu.org/ + /^XGETTEXT_OPTIONS *=/{ + s/$/ \\/ + a\ + --flag=_:1:pass-c-format \\\ + --flag=N_:1:pass-c-format \\\ + --flag=error:3:c-format --flag=error_at_line:5:c-format \\\ + --flag=asnprintf:3:c-format --flag=vasnprintf:3:c-format \\\ + --flag=argp_error:2:c-format \\\ + --flag=__argp_error:2:c-format \\\ + --flag=argp_failure:4:c-format \\\ + --flag=__argp_failure:4:c-format \\\ + --flag=argp_fmtstream_printf:2:c-format \\\ + --flag=__argp_fmtstream_printf:2:c-format + } +' po/Makevars.template >po/Makevars echo "$0: done. Now you can run './configure'." diff --git a/configure.ac b/configure.ac index a7ae04d..017014a 100644 --- a/configure.ac +++ b/configure.ac @@ -212,8 +212,8 @@ AC_CHECK_TYPE(iconv_t,:, ]) # Gettext. -AM_GNU_GETTEXT([external], [need-ngettext]) -AM_GNU_GETTEXT_VERSION(0.12.1) +AM_GNU_GETTEXT([external], [need-formatstring-macros]) +AM_GNU_GETTEXT_VERSION([0.15]) # Initialize the test suite. AC_CONFIG_TESTDIR(tests) -- 2.45.2