Re: new module: xprintf

[Bruno Haible]

> 2007-10-20  Bruno Haible  <address@hidden>
> 
>       * modules/error (Notice): Mention how to augment the XGETTEXT_OPTIONS.
>       * modules/vasprintf (Notice): Likewise.
>       * modules/xprintf (Notice): Likewise.
>       * modules/xvasprintf (Notice): Likewise.

I now applied this. Augmenting the xgettext options will be automatic,
starting with the next gettext version.

2007-10-28  Bruno Haible  <address@hidden>

        * 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.

*** modules/error.orig  2007-10-28 21:35:44.000000000 +0100
--- modules/error       2007-10-28 19:14:27.000000000 +0100
***************
*** 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,16 ****
--- 16,24 ----
  
  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:
  
*** modules/vasprintf.orig      2007-10-28 21:35:44.000000000 +0100
--- modules/vasprintf   2007-10-28 19:14:26.000000000 +0100
***************
*** 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,19 ****
--- 19,27 ----
  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:
  
*** modules/verror.orig 2007-10-28 21:35:44.000000000 +0100
--- modules/verror      2007-10-28 19:14:26.000000000 +0100
***************
*** 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,15 ****
--- 15,23 ----
  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
*** modules/xprintf.orig        2007-10-28 21:35:44.000000000 +0100
--- modules/xprintf     2007-10-28 19:14:26.000000000 +0100
***************
*** 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,18 ****
--- 19,29 ----
  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
*** modules/xvasprintf.orig     2007-10-28 21:35:44.000000000 +0100
--- modules/xvasprintf  2007-10-28 19:12:05.000000000 +0100
***************
*** 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,21 ****
--- 20,27 ----
  
  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