[SCM] GNU M4 source repository branch, master, updated. cvs-readonly-118-g19c823f

[Eric Blake]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU M4 source repository".

http://git.sv.gnu.org/gitweb/?p=m4.git;a=commitdiff;h=19c823f477a093cf19c9d79886e73eb0c0e2edd4

The branch, master has been updated
       via  19c823f477a093cf19c9d79886e73eb0c0e2edd4 (commit)
      from  63274fef7a86432e88938c6787b6e7d4deb4dbf2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 19c823f477a093cf19c9d79886e73eb0c0e2edd4
Author: Eric Blake <address@hidden>
Date:   Mon May 19 06:19:07 2008 -0600

    Fix spelling of René Seindal's name in --version output.
    
    * ltdl/m4/gnulib-cache.m4: Import propername module.
    * src/main.c (AUTHORS): Rewrite in terms of proper_name.
    * po/Makevars (XGETTEXT_OPTIONS): Detect new functions.
    * HACKING: Mention new prerequisite of gperf.
    
    Signed-off-by: Eric Blake <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog               |    8 ++++++++
 HACKING                 |    1 +
 ltdl/m4/gnulib-cache.m4 |    4 ++--
 po/Makevars             |    2 ++
 src/main.c              |    6 +++++-
 5 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1210238..75b6cef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-05-19  Eric Blake  <address@hidden>
+
+       Fix spelling of René Seindal's name in --version output.
+       * ltdl/m4/gnulib-cache.m4: Import propername module.
+       * src/main.c (AUTHORS): Rewrite in terms of proper_name.
+       * po/Makevars (XGETTEXT_OPTIONS): Detect new functions.
+       * HACKING: Mention new prerequisite of gperf.
+
 2008-05-18  Eric Blake  <address@hidden>
 
        Allow freezing the trace status of macros.
diff --git a/HACKING b/HACKING
index 19b5de9..2bf2f6a 100644
--- a/HACKING
+++ b/HACKING
@@ -68,6 +68,7 @@ and is not part of a release distribution.
   - Automake 1.10.1 or later
   - Libtool 2.2 or later
   - Gettext 0.16 or later
+  - Gperf 3.0 or later
   - Help2man 1.29 or later
   - LZMA Utils 4.32 or later (from <http://tukaani.org/lzma/>)
   - Texinfo 4.8 or later
diff --git a/ltdl/m4/gnulib-cache.m4 b/ltdl/m4/gnulib-cache.m4
index 0e122ac..7350e21 100644
--- a/ltdl/m4/gnulib-cache.m4
+++ b/ltdl/m4/gnulib-cache.m4
@@ -15,11 +15,11 @@
 
 
 # Specification in the form of a command-line invocation:
-#   gnulib-tool --import --dir=. --local-dir=local --lib=libgnu 
--source-base=gnu --m4-base=ltdl/m4 --doc-base=doc --aux-dir=build-aux 
--with-tests --libtool --macro-prefix=M4 assert autobuild avltree-oset 
binary-io clean-temp cloexec close-stream closein config-h configmake dirname 
error exit fdl fflush filenamecat flexmember fopen-safer fseeko gendocs gettext 
git-version-gen gnumakefile gnupload gpl-3.0 intprops memmem mkstemp obstack 
progname quote regex regexprops-generic sprintf-posix stdbool stdlib-safer 
strnlen strtod strtol tempname unlocked-io vasnprintf-posix verror xalloc 
xalloc-die xprintf-posix xstrndup xvasprintf-posix
+#   gnulib-tool --import --dir=. --local-dir=local --lib=libgnu 
--source-base=gnu --m4-base=ltdl/m4 --doc-base=doc --aux-dir=build-aux 
--with-tests --libtool --macro-prefix=M4 assert autobuild avltree-oset 
binary-io clean-temp cloexec close-stream closein config-h configmake dirname 
error exit fdl fflush filenamecat flexmember fopen-safer fseeko gendocs gettext 
git-version-gen gnumakefile gnupload gpl-3.0 intprops memmem mkstemp obstack 
progname propername quote regex regexprops-generic sprintf-posix stdbool 
stdlib-safer strnlen strtod strtol tempname unlocked-io vasnprintf-posix verror 
xalloc xalloc-die xprintf-posix xstrndup xvasprintf-posix
 
 # Specification in the form of a few gnulib-tool.m4 macro invocations:
 gl_LOCAL_DIR([local])
-gl_MODULES([assert autobuild avltree-oset binary-io clean-temp cloexec 
close-stream closein config-h configmake dirname error exit fdl fflush 
filenamecat flexmember fopen-safer fseeko gendocs gettext git-version-gen 
gnumakefile gnupload gpl-3.0 intprops memmem mkstemp obstack progname quote 
regex regexprops-generic sprintf-posix stdbool stdlib-safer strnlen strtod 
strtol tempname unlocked-io vasnprintf-posix verror xalloc xalloc-die 
xprintf-posix xstrndup xvasprintf-posix])
+gl_MODULES([assert autobuild avltree-oset binary-io clean-temp cloexec 
close-stream closein config-h configmake dirname error exit fdl fflush 
filenamecat flexmember fopen-safer fseeko gendocs gettext git-version-gen 
gnumakefile gnupload gpl-3.0 intprops memmem mkstemp obstack progname 
propername quote regex regexprops-generic sprintf-posix stdbool stdlib-safer 
strnlen strtod strtol tempname unlocked-io vasnprintf-posix verror xalloc 
xalloc-die xprintf-posix xstrndup xvasprintf-posix])
 gl_AVOID([])
 gl_SOURCE_BASE([gnu])
 gl_M4_BASE([ltdl/m4])
diff --git a/po/Makevars b/po/Makevars
index d952fe8..74f3bac 100644
--- a/po/Makevars
+++ b/po/Makevars
@@ -31,6 +31,8 @@ XGETTEXT_OPTIONS = \
   --from-code=UTF-8 \
   --keyword=_ --flag=_:1:pass-c-format \
   --keyword=N_ --flag=N_:1:pass-c-format \
+  --keyword=proper_name:1,"This is a proper name. See the gettext manual, 
section Names." \
+  --keyword=proper_name_utf8:1,"This is a proper name. See the gettext manual, 
section Names." \
   --flag=error:3:c-format --flag=error_at_line:5:c-format \
   --flag=verror:3:c-format --flag=verror_at_line:5:c-format \
   --flag=asprintf:2:c-format --flag=vasprintf:2:c-format \
diff --git a/src/main.c b/src/main.c
index e500046..7690147 100644
--- a/src/main.c
+++ b/src/main.c
@@ -29,11 +29,15 @@
 #include "closein.h"
 #include "configmake.h"
 #include "getopt.h"
+#include "propername.h"
 #include "quotearg.h"
 #include "version-etc.h"
 #include "xstrtol.h"
 
-#define AUTHORS _("Rene' Seindal"), "Gary V. Vaughan", "Eric Blake"
+#define AUTHORS                                                        \
+  proper_name_utf8 ("Rene' Seindal", "Ren\xc3\xa9 Seindal"),   \
+  proper_name ("Gary V. Vaughan"),                             \
+  proper_name ("Eric Blake")
 
 typedef struct deferred
 {


hooks/post-receive
--
GNU M4 source repository