* MODULES.html.sh (Command-line arguments): Add version-etc-fsf.

* modules/version-etc-fsf: New file.
* lib/version-etc-fsf.c: New file, with version_etc_copyright.
* lib/version-etc.c: Remove version_etc_copyright.
* lib/version-etc.h (version_etc_copyright): Use [] instead of * in
prototype.

diff --git a/ChangeLog b/ChangeLog
index 6c7418ce7aa5047e14e364817d3d077924521d09..e0768c1a614792fb2652720d0f39b7bbc726f995 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-01-20  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * MODULES.html.sh (Command-line arguments): Add version-etc-fsf.
+
+2005-01-20  Simon Josefsson  <jas@extundo.com>
+
+       * modules/version-etc-fsf: New file.
+
 2005-01-19  Paul Eggert  <eggert@cs.ucla.edu>
 
         * modules/mempcpy (Makefile.am): Remove mention of mempcpy.h;

diff --git a/MODULES.html.sh b/MODULES.html.sh
index 5334321899bbb88691ba8adc32fae00e56a53a25..c6b29c3b624bf05cca8f5a429477a2c2e4295da3 100755 (executable)
--- a/MODULES.html.sh
+++ b/MODULES.html.sh
@@ -1584,6 +1584,7 @@ func_all_modules ()
   func_begin_table
   func_module argmatch
   func_module version-etc
+  func_module version-etc-fsf
   func_module long-options
   func_end_table
 

diff --git a/lib/ChangeLog b/lib/ChangeLog
index c161814442eece70e7963ec0979033562940cb38..8f7c818c4135fd147c38df0c7c35f64e1885b21d 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,10 @@
+2005-01-20  Simon Josefsson  <jas@extundo.com>
+
+       * version-etc-fsf.c: New file, with version_etc_copyright.
+       * version-etc.c: Remove version_etc_copyright.
+       * version-etc.h (version_etc_copyright): Use [] instead of * in
+       prototype, suggested by Paul Eggert <eggert@CS.UCLA.EDU>.
+
 2005-01-20  Paul Eggert  <eggert@cs.ucla.edu>
 
        * save-cwd.c (save_cwd): Remove code to support the case

diff --git a/lib/version-etc-fsf.c b/lib/version-etc-fsf.c
new file mode 100644 (file)
index 0000000..289ce45
--- /dev/null
+++ b/lib/version-etc-fsf.c
@@ -0,0 +1,31 @@
+/* Variable with FSF copyright information, for version-etc.
+   Copyright (C) 1999-2005 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+/* Written by Jim Meyering. */
+
+#if HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+/* Specification.  */
+#include "version-etc.h"
+
+/* Default copyright goes to the FSF. */
+
+const char version_etc_copyright[] =
+  /* Do *not* mark this string for translation.  */
+  "Copyright (C) 2005 Free Software Foundation, Inc.";

diff --git a/lib/version-etc.c b/lib/version-etc.c
index 95b7e40d15fa5cbb92a10c3e5c076ace1e563362..ac5844ce9a1bfe5dd93296c413b1d867e683a3ed 100644 (file)
--- a/lib/version-etc.c
+++ b/lib/version-etc.c
@@ -35,13 +35,6 @@
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 
-/* Default copyright goes to the FSF. */
-
-const char* version_etc_copyright =
-  /* Do *not* mark this string for translation.  */
-  "Copyright (C) 2005 Free Software Foundation, Inc.";
-
-
 /* Like version_etc, below, but with the NULL-terminated author list
    provided via a variable of type va_list.  */
 void

diff --git a/lib/version-etc.h b/lib/version-etc.h
index d505e75eae7df03a06ec6097371f93d27d1cff68..f1acb6587020890569d6aabc0e9c8717f1da5619 100644 (file)
--- a/lib/version-etc.h
+++ b/lib/version-etc.h
@@ -1,5 +1,5 @@
 /* Utility to help print --version output in a consistent format.
-   Copyright (C) 1999, 2003 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2003, 2005 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -23,7 +23,7 @@
 # include <stdarg.h>
 # include <stdio.h>
 
-extern const char *version_etc_copyright;
+extern const char version_etc_copyright[];
 
 extern void version_etc_va (FILE *stream,
                            const char *command_name, const char *package,

diff --git a/modules/version-etc-fsf b/modules/version-etc-fsf
new file mode 100644 (file)
index 0000000..698d41a
--- /dev/null
+++ b/modules/version-etc-fsf
@@ -0,0 +1,21 @@
+Description:
+Copyright variable for FSF projects
+
+Files:
+lib/version-etc-fsf.c
+
+Depends-on:
+version-etc
+
+configure.ac:
+
+Makefile.am:
+lib_SOURCES += version-etc-fsf.c
+
+Include:
+
+License:
+GPL
+
+Maintainer:
+Jim Meyering