From 7855cbfcac867621c18d1fc85abe5332f6aae1ec Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering@redhat.com>
Date: Mon, 19 May 2008 16:14:13 +0200
Subject: use gnulib's proper_name_utf8 function, but *not* proper_name
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* bootstrap.conf (gnulib_modules): Add propername.
(XGETTEXT_OPTIONS): Add options to tell xgettext about the functions.
* src/cat.c, src/cp.c, src/df.c, src/du.c, src/split.c:
Mark Torbjörn Granlund's name.
* src/ptx.c: Mark François Pinard's name.
Use "TRANSLATORS:" comment marker, rather than "Note to translators:".
* src/system.h: Include propername.h.
(proper_name): Define away.
* src/Makefile.am (cat_LDADD, df_LDADD, du_LDADD, ptx_LDADD, split_LDADD):
Initialize, so we can...
(cat_LDADD, cp_LDADD, df_LDADD, du_LDADD, ptx_LDADD, split_LDADD):
...Use "+=" to append $(LIBICONV) for each program that uses
proper_name_utf8.
---
 bootstrap.conf | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'bootstrap.conf')

diff --git a/bootstrap.conf b/bootstrap.conf
index f74f7596b..7b5be8386 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -67,7 +67,11 @@ gnulib_modules="
 	memrchr mgetgroups
 	mkancesdirs mkdir mkdir-p mkstemp mktime modechange
 	mountlist mpsort obstack pathmax perl physmem
-	posix-shell posixtm posixver putenv
+	posix-shell
+	posixtm
+	posixver
+	propername
+	putenv
 	quote quotearg raise readlink areadlink-with-size
 	randint
 	randperm
@@ -118,6 +122,14 @@ XGETTEXT_OPTIONS=$XGETTEXT_OPTIONS'\\\
  --flag=xprintf:1:c-format\\\
 '
 
+# Append these, since we use the propername module.
+see_manual='"This is a proper name. See the gettext manual, section Names."'
+see_manual=\'"$see_manual"\'
+XGETTEXT_OPTIONS=$XGETTEXT_OPTIONS'\\\
+ --keyword=proper_name:1,'"$see_manual"'\\\
+ --keyword=proper_name_utf8:1,'"$see_manual"'\\\
+'
+
 # If "AM_GNU_GETTEXT(external" or "AM_GNU_GETTEXT([external]"
 # appears in configure.ac, exclude some unnecessary files.
 # Without grep's -E option (not portable enough, pre-configure),
-- 
cgit v1.2.3-54-g00ecf