diff options
| author | Bruno Haible <bruno@clisp.org> | 2007-10-28 21:39:15 +0100 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2007-10-28 21:39:15 +0100 |
| commit | 85c433f05b176d4db91c76619cdd756c17f94705 (patch) | |
| tree | 69d37734afebdfe196abcc30fd6750e01adf80fc | |
| parent | e74e1f1540f02fc57e442a6281c62f9594af15e5 (diff) | |
| download | gnulib-85c433f05b176d4db91c76619cdd756c17f94705.tar.gz | |
Notify xgettext about functions that have a format string argument.
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | modules/error | 8 | ||||
| -rw-r--r-- | modules/vasprintf | 8 | ||||
| -rw-r--r-- | modules/verror | 8 | ||||
| -rw-r--r-- | modules/xprintf | 11 | ||||
| -rw-r--r-- | modules/xvasprintf | 6 |
6 files changed, 50 insertions, 0 deletions
@@ -1,3 +1,12 @@ +2007-10-28 Bruno Haible <bruno@clisp.org> + + * modules/error: Add a notice recommending to change XGETTEXT_OPTIONS. + Invoke AM_GETTEXT_OPTION if it exists. + * modules/vasprintf: Likewise. + * modules/verror: Likewise. + * modules/xprintf: Likewise. + * modules/xvasprintf: Likewise. + 2007-10-27 Ben Pfaff <blp@gnu.org> * lib/math.in.h: Define isfinite macro and prototypes for diff --git a/modules/error b/modules/error index cdf57f07d5..1b58cdac71 100644 --- a/modules/error +++ b/modules/error @@ -1,6 +1,11 @@ Description: error() and error_at_line() functions: Error reporting. +Notice: +If you are using GNU gettext version 0.16.1 or older, add the following options +to XGETTEXT_OPTIONS in your po/Makevars: + --flag=error:3:c-format --flag=error_at_line:5:c-format + Files: lib/error.h lib/error.c @@ -11,6 +16,9 @@ strerror configure.ac: gl_ERROR +m4_ifdef([AM_XGETTEXT_OPTION], + [AM_XGETTEXT_OPTION([--flag=error:3:c-format]) + AM_XGETTEXT_OPTION([--flag=error_at_line:5:c-format])]) Makefile.am: diff --git a/modules/vasprintf b/modules/vasprintf index 6ca71bd311..bdd642f4ba 100644 --- a/modules/vasprintf +++ b/modules/vasprintf @@ -1,6 +1,11 @@ Description: vsprintf with automatic memory allocation. +Notice: +If you are using GNU gettext version 0.16.1 or older, add the following options +to XGETTEXT_OPTIONS in your po/Makevars: + --flag=asprintf:2:c-format --flag=vasprintf:2:c-format + Files: lib/vasprintf.c lib/asprintf.c @@ -14,6 +19,9 @@ stdio configure.ac: gl_FUNC_VASPRINTF gl_STDIO_MODULE_INDICATOR([vasprintf]) +m4_ifdef([AM_XGETTEXT_OPTION], + [AM_XGETTEXT_OPTION([--flag=asprintf:2:c-format]) + AM_XGETTEXT_OPTION([--flag=vasprintf:2:c-format])]) Makefile.am: diff --git a/modules/verror b/modules/verror index 4b4b621e7f..5c43dfe427 100644 --- a/modules/verror +++ b/modules/verror @@ -1,6 +1,11 @@ Description: verror() and verror_at_line() functions: Error reporting with va_list. +Notice: +If you are using GNU gettext version 0.16.1 or older, add the following options +to XGETTEXT_OPTIONS in your po/Makevars: + --flag=verror:3:c-format --flag=verror_at_line:5:c-format + Files: lib/verror.h lib/verror.c @@ -10,6 +15,9 @@ error xvasprintf configure.ac: +m4_ifdef([AM_XGETTEXT_OPTION], + [AM_XGETTEXT_OPTION([--flag=verror:3:c-format]) + AM_XGETTEXT_OPTION([--flag=verror_at_line:5:c-format])]) Makefile.am: lib_SOURCES += verror.h verror.c diff --git a/modules/xprintf b/modules/xprintf index b21252f702..e3ad1e0950 100644 --- a/modules/xprintf +++ b/modules/xprintf @@ -1,6 +1,12 @@ Description: a wrapper around printf that calls error upon ENOMEM or EILSEQ errors +Notice: +If you are using GNU gettext version 0.16.1 or older, add the following options +to XGETTEXT_OPTIONS in your po/Makevars: + --flag=xprintf:1:c-format --flag=xvprintf:1:c-format + --flag=xfprintf:2:c-format --flag=xvfprintf:2:c-format + Files: lib/xprintf.h lib/xprintf.c @@ -13,6 +19,11 @@ stdarg stdio configure.ac: +m4_ifdef([AM_XGETTEXT_OPTION], + [AM_XGETTEXT_OPTION([--flag=xprintf:1:c-format]) + AM_XGETTEXT_OPTION([--flag=xvprintf:1:c-format]) + AM_XGETTEXT_OPTION([--flag=xfprintf:2:c-format]) + AM_XGETTEXT_OPTION([--flag=xvfprintf:2:c-format])]) Makefile.am: lib_SOURCES += xprintf.h xprintf.c diff --git a/modules/xvasprintf b/modules/xvasprintf index 984509cb42..18be1fe39d 100644 --- a/modules/xvasprintf +++ b/modules/xvasprintf @@ -1,6 +1,10 @@ Description: vasprintf and asprintf with out-of-memory checking. Also see xalloc-die. +Notice: +If you are using GNU gettext version 0.16.1 or older, add the following options +to XGETTEXT_OPTIONS in your po/Makevars: --flag=xasprintf:1:c-format + Files: lib/xvasprintf.h lib/xvasprintf.c @@ -16,6 +20,8 @@ stdarg configure.ac: gl_XVASPRINTF +m4_ifdef([AM_XGETTEXT_OPTION], + [AM_XGETTEXT_OPTION([--flag=xasprintf:1:c-format])]) Makefile.am: lib_SOURCES += xvasprintf.h xvasprintf.c xasprintf.c |