* 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
<http://lists.gnu.org/archive/html/bug-coreutils/2006-07/msg00087.html>.
(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.

diff --git a/ChangeLog b/ChangeLog
index db04d62ebd43b7e78d8649c3d937d456b34c262a..035e4084240facdc0590ed2d627949012f69e021 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 2006-08-11  Paul Eggert  <eggert@cs.ucla.edu>
 
+       * 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
+       <http://lists.gnu.org/archive/html/bug-coreutils/2006-07/msg00087.html>.
+       (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 e23eb0f3a81f874e6c2613e1a167f818baa9967a..57307dff2fd0ef6f7a7cfed3a206b2ded6a831d5 100755 (executable)
--- 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 a7ae04d73b08965fcf3747177e27ae7ad19220fc..017014a97e5fcef28e9085cfff74e70727f69c55 100644 (file)
--- 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)