From: Sergey Poznyakoff <gray@gnu.org.ua>
Date: Thu, 25 Jun 2009 11:05:03 +0000 (+0300)
Subject: Fix inconsistencies in the previous commit.
X-Git-Tag: v0.1~5835
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=12ce56554d4b863d351ba5b828b6716154f2c2ae;p=gnulib.git

Fix inconsistencies in the previous commit.

* lib/argp-version-etc.c (program_authors): Add const
qualifier.
* lib/version-etc.c: Fix typos in the comments.
* modules/argp-version-etc: Depends on version-etc.
---

diff --git a/ChangeLog b/ChangeLog
index 11684a386..5faaa7f96 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2009-06-25  Sergey Poznyakoff  <gray@gnu.org.ua>
 
+       * lib/argp-version-etc.c (program_authors): Add const
+       qualifier.
+       * lib/version-etc.c: Fix typos in the comments.
+       * modules/argp-version-etc: Depends on version-etc.
+
+2009-06-25  Sergey Poznyakoff  <gray@gnu.org.ua>
+
 	argp-version-etc: new module.
 
 	* lib/argp-version-etc.c: New file.
diff --git a/lib/argp-version-etc.c b/lib/argp-version-etc.c
index e681196f6..2b9119579 100644
--- a/lib/argp-version-etc.c
+++ b/lib/argp-version-etc.c
@@ -20,7 +20,7 @@
 #include <argp-version-etc.h>
 
 static const char *program_canonical_name;
-static const char **program_authors;
+static const char * const *program_authors;
 
 static void
 version_etc_hook (FILE *stream, struct argp_state *state)
diff --git a/lib/version-etc.c b/lib/version-etc.c
index ddac30542..9580f5386 100644
--- a/lib/version-etc.c
+++ b/lib/version-etc.c
@@ -37,7 +37,7 @@ enum { COPYRIGHT_YEAR = 2009 };
 /* The three functions below display the --version information the
    standard way.
 
-   If COMMAND_NAME is NULL, the PACKAGE is asumed to be the name of
+   If COMMAND_NAME is NULL, the PACKAGE is assumed to be the name of
    the program.  The formats are therefore:
 
    PACKAGE VERSION
@@ -206,7 +206,7 @@ version_etc_va (FILE *stream,
 
 /* Display the --version information the standard way.
 
-   If COMMAND_NAME is NULL, the PACKAGE is asumed to be the name of
+   If COMMAND_NAME is NULL, the PACKAGE is assumed to be the name of
    the program.  The formats are therefore:
 
    PACKAGE VERSION
diff --git a/modules/argp-version-etc b/modules/argp-version-etc
index 464fc9575..20a479c9a 100644
--- a/modules/argp-version-etc
+++ b/modules/argp-version-etc
@@ -7,6 +7,7 @@ lib/argp-version-etc.h
 
 Depends-on:
 argp
+version-etc
 
 Makefile.am:
 lib_SOURCES += argp-version-etc.h argp-version-etc.c