From: Colin Watson <cjwatson@debian.org>
Date: Mon, 14 Jan 2008 22:35:44 +0000 (+0100)
Subject: Make the functions argp_error, argp_failure known to xgettext.
X-Git-Tag: v0.1~7833
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=fab30d537b3c7826a89471293f1d2b9a5743cf1a;p=gnulib.git

Make the functions argp_error, argp_failure known to xgettext.
---

diff --git a/ChangeLog b/ChangeLog
index 5b90e0019..5ac469e60 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-01-14  Colin Watson  <cjwatson@debian.org>
+
+	* modules/argp (Notice): Add a notice recommending to change
+	XGETTEXT_OPTIONS.
+	(configure.ac): Invoke AM_XGETTEXT_OPTION if it exists.
+
 2008-01-13  Colin Watson  <cjwatson@debian.org>
 
 	* modules/strsignal-tests: New file.
diff --git a/modules/argp b/modules/argp
index da65d4f3c..de801ae24 100644
--- a/modules/argp
+++ b/modules/argp
@@ -1,6 +1,11 @@
 Description:
 Hierarchical processing of command line arguments.
 
+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=argp_error:2:c-format --flag=argp_failure:4:c-format
+
 Files:
 lib/argp.h
 lib/argp-ba.c
@@ -34,6 +39,9 @@ strerror
 
 configure.ac:
 gl_ARGP
+m4_ifdef([AM_XGETTEXT_OPTION],
+  [AM_XGETTEXT_OPTION([--flag=argp_error:2:c-format])
+   AM_XGETTEXT_OPTION([--flag=argp_failure:4:c-format])])
 
 Makefile.am:
 lib_SOURCES += argp.h argp-ba.c argp-eexst.c \