[patch] Allow translation of the copyright symbol. (take 3)

[Kazu Hirata <kazu at cs dot umass dot edu>]

Hi,

Attached is a patch to allow translation of the copyright symbol but
not the rest of the copyright messages.

Bootstrapped on i686-pc-linux-gnu.  OK to apply to mainline and 3.4
branch?

Kazu Hirata

gcc/
2004-02-13  Kazu Hirata  <kazu@cs.umass.edu>

	* gcc.c (process_command): Allow translation of the copyright
	symbol but not the rest of the copyright message.
	* gcov.c (print_version): Likewise.  Allow translation of the
	message about warranty.

gcc/f/
2004-02-13  Kazu Hirata  <kazu@cs.umass.edu>

	* Make-lang.in (g77spec.o): Depend on intl.h.
	* g77spec.c: Include intl.h.
	(lang_specific_driver): Allow translation of the copyright
	symbol but not the rest of the copyright message.  Allow
	translation of the message about warranty.

Index: gcc.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/gcc.c,v
retrieving revision 1.405
diff -u -r1.405 gcc.c
--- gcc.c	24 Jan 2004 10:09:48 -0000	1.405
+++ gcc.c	12 Feb 2004 21:49:09 -0000
@@ -3347,8 +3347,8 @@
 	{
 	  /* translate_options () has turned --version into -fversion.  */
 	  printf (_("%s (GCC) %s\n"), programname, version_string);
-	  fputs ("Copyright (C) 2004 Free Software Foundation, Inc.\n",
-		 stdout);
+	  printf ("Copyright %s 2004 Free Software Foundation, Inc.\n",
+		  _("(C)"));
 	  fputs (_("This is free software; see the source for copying conditions.  There is NO\n\
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\n"),
 		 stdout);
Index: gcov.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/gcov.c,v
retrieving revision 1.78
diff -u -r1.78 gcov.c
--- gcov.c	21 Dec 2003 14:08:33 -0000	1.78
+++ gcov.c	12 Feb 2004 21:49:10 -0000
@@ -1,7 +1,7 @@
 /* Gcov.c: prepend line execution counts and branch probabilities to a
    source file.
    Copyright (C) 1990, 1991, 1992, 1993, 1994, 1996, 1997, 1998,
-   1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+   1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
    Contributed by James E. Wilson of Cygnus Support.
    Mangled by Bob Manson of Cygnus Support.
    Mangled further by Nathan Sidwell <nathan@codesourcery.com>
@@ -420,11 +420,12 @@
 print_version (void)
 {
   fnotice (stdout, "gcov (GCC) %s\n", version_string);
-  fnotice (stdout, "Copyright (C) 2003 Free Software Foundation, Inc.\n");
+  fprintf (stdout, "Copyright %s 2004 Free Software Foundation, Inc.\n",
+	   _("(C)"));
   fnotice (stdout,
-	   "This is free software; see the source for copying conditions.\n"
-  	   "There is NO warranty; not even for MERCHANTABILITY or \n"
-	   "FITNESS FOR A PARTICULAR PURPOSE.\n\n");
+	   _("This is free software; see the source for copying conditions.\n"
+	     "There is NO warranty; not even for MERCHANTABILITY or \n"
+	     "FITNESS FOR A PARTICULAR PURPOSE.\n\n"));
   exit (SUCCESS_EXIT_CODE);
 }
 
Index: f/Make-lang.in
===================================================================
RCS file: /cvs/gcc/gcc/gcc/f/Make-lang.in,v
retrieving revision 1.142
diff -u -r1.142 Make-lang.in
--- f/Make-lang.in	31 Jan 2004 00:50:01 -0000	1.142
+++ f/Make-lang.in	12 Feb 2004 21:49:12 -0000
@@ -63,7 +63,7 @@
   f77.stageprofile f77.stagefeedback
 
 g77spec.o: $(srcdir)/f/g77spec.c $(SYSTEM_H) coretypes.h $(TM_H) $(GCC_H) \
-	$(CONFIG_H)
+	$(CONFIG_H) intl.h
 	(SHLIB_LINK='$(SHLIB_LINK)' \
 	SHLIB_MULTILIB='$(SHLIB_MULTILIB)'; \
 	$(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(DRIVER_DEFINES) \
Index: f/g77spec.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/f/g77spec.c,v
retrieving revision 1.45
diff -u -r1.45 g77spec.c
--- f/g77spec.c	19 Jul 2003 16:09:38 -0000	1.45
+++ f/g77spec.c	12 Feb 2004 21:49:12 -0000
@@ -1,5 +1,5 @@
 /* Specific flags and argument handling of the Fortran front-end.
-   Copyright (C) 1997, 1999, 2000, 2001, 2002, 2003
+   Copyright (C) 1997, 1999, 2000, 2001, 2002, 2003, 2004
    Free Software Foundation, Inc.
 
 This file is part of GCC.
@@ -50,6 +50,7 @@
 #include "coretypes.h"
 #include "tm.h"
 #include "gcc.h"
+#include "intl.h"
 
 #ifndef MATH_LIBRARY
 #define MATH_LIBRARY "-lm"
@@ -345,16 +346,17 @@
 	  break;
 
 	case OPTION_version:
-	  printf ("\
-GNU Fortran (GCC) %s\n\
-Copyright (C) 2002 Free Software Foundation, Inc.\n\
-\n\
+	  printf ("GNU Fortran (GCC) %s\n", version_string);
+	  printf ("Copyright %s 2004 Free Software Foundation, Inc.\n",
+		  _("(C)"));
+	  printf ("\n");
+	  printf (_("\
 GNU Fortran comes with NO WARRANTY, to the extent permitted by law.\n\
 You may redistribute copies of GNU Fortran\n\
 under the terms of the GNU General Public License.\n\
 For more information about these matters, see the file named COPYING\n\
 or type the command `info -f g77 Copying'.\n\
-", version_string);
+"));
 	  exit (0);
 	  break;