New PATCH for CVS mainline sources to make ``--enable-nls'' work

[Manfred Hollstein <manfred at s-direktnet dot de>]

On Sun, 21 February 1999, 23:55:22, eggert@twinsun.com wrote:

 >    Date: Sun, 21 Feb 1999 15:06:03 +0100 (MET)
 >    From: Manfred Hollstein <manfred@s-direktnet.de>
 > 
 >      gcc/po/cat-id-tbl.c
 >      gcc/po/gcc.pot
 >      gcc/po/stamp-cat-id
 > 
 >    I don't know, if they should be checked into the CVS tree???
 > 
 > Those files are generated automatically, so they don't need to be
 > checked in.  However, some maintainers like to check in the files
 > anyway.  Hmm, what's the tradition at Cygnus for internationalized
 > software?

If everybody has the necessary programs installed, OK.  I'm afraid
though, they don't; I'd prefer to check them into the tree.
Jeff, opinions?

 > 
 > Here are some comments about your patches to gcc/po/POTFILES.in:
 > 
 >    +#getopt.c is part of libiberty in egcs
 > 
 > Unfortunately, this change will break the localization of several
 > strings in getopt.c, e.g. "%s: option `%s' is ambiguous\n".  How do
 > other programs that use libiberty address this issue?  One hacky
 > workaround is to plant a symbolic link from getopt.c to
 > ../libiberty/getopt.c, just so that xgettext can see it.  But I hope
 > there's a better way.

OK, so let's use the relative pathname to where the files in
question are actually living?  I just tried it and nothing broke.

 > 
 >    +#pexecute.c is part of libiberty in egcs
 > 
 > pexecute.c has two strings that need localization: "cannot open
 > `%s.gp'" and "installation problem, cannot exec `%s'".  These have
 > been wrapped in GCC2 copy of pexecute.c, but not yet in the Cygnus
 > master copy of pexecute.c.  Once the Cygnus mater copy of pexecute.c
 > picks up these changes, the problem then becomes similar to that of
 > getopt.c, and can be solved in a similar way.

See above.

 >    
 > As for the other lines that you commented out from POTFILES.in:
 > it's better to remove the lines than comment them out, so that one can
 > automatically check whether POTFILES.in is up-to-date.  This automatic
 > check is in GCC2 (as part of distdir-check), but is not yet in egcs
 > (otherwise you wouldn't be having these problems :-).
 > 
 > Thanks for looking into the problem; I haven't had time to get up to
 > speed on egcs development yet.

I've appended a new patch, which I just have sanity checked with a
successful "make bootstrap check" on i586-linux on a freshly checked
out CVS tree with ``--enable-nls'' added.  BTW, this patch adds
"intl.o" to the F77 driver program, too; somehow it slipped through
yesterday :-?

OK to install?

manfred


gcc/ChangeLog:

1999-02-22  Manfred Hollstein  <manfred@s-direktnet.de>

	* Makefile.in (xgcc$(exeext)): Add intl.o to list of files to be
	linked with.

gcc/f/ChangeLog:

1999-02-22  Manfred Hollstein  <manfred@s-direktnet.de>

	* Makefile.in (g77$(exeext)): Depend on intl.o.  Link in intl.o.

gcc/java/ChangeLog:

1999-02-22  Manfred Hollstein  <manfred@s-direktnet.de>

	* Make-lang.in ($(GCJ)$(exeext)): Add intl.o to list of files to be
	linked with.

gcc/po/ChangeLog:

1999-02-22  Manfred Hollstein  <manfred@s-direktnet.de>

	POTFILES.in: Remove files which do not exist anymore in egcs.
	Fix names of those files which are now living in egcs's
	libiberty/include directories.

diff -rup -x CVS -x RCS -x *.o -x *.info* -x *.html* -x *.elc -x *.dvi -x *.orig -x *~ -x version.el egcs-19990222.orig/gcc/Makefile.in egcs-19990222/gcc/Makefile.in
--- egcs-19990222.orig/gcc/Makefile.in	Fri Feb 19 11:40:46 1999
+++ egcs-19990222/gcc/Makefile.in	Mon Feb 22 13:08:44 1999
@@ -875,7 +875,7 @@ stamp-objlist: $(OBJS) 
 # and CC is `gcc'.  It is renamed to `gcc' when it is installed.
 xgcc$(exeext): gcc.o version.o intl.o prefix.o \
    version.o $(LIBDEPS) $(EXTRA_GCC_OBJS)
-	$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ gcc.o prefix.o version.o \
+	$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ gcc.o intl.o prefix.o version.o \
 	  $(EXTRA_GCC_OBJS) $(LIBS)
 
 # Dump a specs file to make -B./ read these specs over installed ones.
diff -rup -x CVS -x RCS -x *.o -x *.info* -x *.html* -x *.elc -x *.dvi -x *.orig -x *~ -x version.el egcs-19990222.orig/gcc/f/Make-lang.in egcs-19990222/gcc/f/Make-lang.in
--- egcs-19990222.orig/gcc/f/Make-lang.in	Thu Feb  4 09:03:19 1999
+++ egcs-19990222/gcc/f/Make-lang.in	Mon Feb 22 13:57:27 1999
@@ -103,11 +103,11 @@ g77.o: $(CONFIG_H) multilib.h config.sta
 	else true; fi
 
 # Create the compiler driver for g77.
-g77$(exeext): g77.o g77spec.o g77version.o version.o prefix.o \
+g77$(exeext): g77.o g77spec.o g77version.o version.o prefix.o intl.o \
   $(LIBDEPS) $(EXTRA_GCC_OBJS)
 	if [ -f lang-f77 ]; then \
 	  $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ g77.o g77spec.o g77version.o \
-	   version.o prefix.o $(EXTRA_GCC_OBJS) $(LIBS); \
+	   version.o prefix.o intl.o $(EXTRA_GCC_OBJS) $(LIBS); \
 	else true; fi
 
 # Create a version of the g77 driver which calls the cross-compiler.
diff -rup -x CVS -x RCS -x *.o -x *.info* -x *.html* -x *.elc -x *.dvi -x *.orig -x *~ -x version.el egcs-19990222.orig/gcc/java/Make-lang.in egcs-19990222/gcc/java/Make-lang.in
--- egcs-19990222.orig/gcc/java/Make-lang.in	Thu Feb  4 09:03:37 1999
+++ egcs-19990222/gcc/java/Make-lang.in	Mon Feb 22 13:08:44 1999
@@ -101,8 +101,8 @@ $(GCJ).o: $(CONFIG_H) multilib.h config.
 
 # Create the compiler driver for $(GCJ).
 $(GCJ)$(exeext): $(GCJ).o jvspec.o version.o \
-	   prefix.o $(LIBDEPS) $(EXTRA_GCC_OBJS)
-	$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(GCJ).o jvspec.o prefix.o \
+	   prefix.o intl.o $(LIBDEPS) $(EXTRA_GCC_OBJS)
+	$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(GCJ).o jvspec.o prefix.o intl.o \
 	  version.o $(EXTRA_GCC_OBJS) $(LIBS)
 
 # Create a version of the $(GCJ) driver which calls the cross-compiler.
diff -rup -x CVS -x RCS -x *.o -x *.info* -x *.html* -x *.elc -x *.dvi -x *.orig -x *~ -x version.el egcs-19990222.orig/gcc/po/POTFILES.in egcs-19990222/gcc/po/POTFILES.in
--- egcs-19990222.orig/gcc/po/POTFILES.in	Thu Dec 17 07:45:44 1998
+++ egcs-19990222/gcc/po/POTFILES.in	Mon Feb 22 13:21:19 1999
@@ -47,27 +47,10 @@
 
 
 acconfig.h
-alloca.c
 assert.h
 basic-block.h
-bc-emit.c
-bc-emit.h
-bc-optab.c
-bc-optab.h
-bc-typecd.h
-bi-arity.c
-bi-defs.h
-bi-lexer.c
-bi-opcode.c
-bi-opname.c
-bi-parser.c
-bi-parser.h
-bi-reverse.c
-bi-run.h
 bitmap.c
 bitmap.h
-bytecode.h
-bytetypes.h
 c-aux-info.c
 c-common.c
 c-convert.c
@@ -87,7 +70,7 @@ caller-save.c
 calls.c
 cccp.c
 cexp.c
-choose-temp.c
+../libiberty/choose-temp.c
 collect2.c
 combine.c
 conditions.h
@@ -120,7 +103,6 @@ config/arm/arm.c
 config/arm/arm.h
 config/arm/coff.h
 config/arm/linux-gas.h
-config/arm/linux.h
 config/arm/netbsd.h
 config/arm/riscix.h
 config/arm/riscix1-1.h
@@ -168,7 +150,7 @@ config/i386/att.h
 config/i386/bsd.h
 config/i386/bsd386.h
 config/i386/crtdll.h
-config/i386/cygwin32.h
+config/i386/cygwin.h
 config/i386/dgux.c
 config/i386/dgux.h
 config/i386/freebsd-elf.h
@@ -228,7 +210,7 @@ config/i386/vsta.h
 config/i386/win-nt.h
 config/i386/winnt.c
 config/i386/xm-aix.h
-config/i386/xm-cygwin32.h
+config/i386/xm-cygwin.h
 config/i386/xm-dos.h
 config/i386/xm-go32.h
 config/i386/xm-i386.h
@@ -453,7 +435,7 @@ config/romp/xm-romp.h
 config/rs6000/aix31.h
 config/rs6000/aix3newas.h
 config/rs6000/aix41.h
-config/rs6000/cygwin32.h
+config/rs6000/cygwin.h
 config/rs6000/eabi-ctors.c
 config/rs6000/eabi.h
 config/rs6000/eabiaix.h
@@ -464,7 +446,7 @@ config/rs6000/linux.h
 config/rs6000/lynx.h
 config/rs6000/mach.h
 config/rs6000/netware.h
-config/rs6000/powerpc.h
+#config/rs6000/powerpc.h does not exist anymore in egcs
 config/rs6000/rs6000.c
 config/rs6000/rs6000.h
 config/rs6000/rtems.h
@@ -474,7 +456,7 @@ config/rs6000/sysv4.h
 config/rs6000/sysv4le.h
 config/rs6000/vxppc.h
 config/rs6000/win-nt.h
-config/rs6000/xm-cygwin32.h
+config/rs6000/xm-cygwin.h
 config/rs6000/xm-lynx.h
 config/rs6000/xm-mach.h
 config/rs6000/xm-rs6000.h
@@ -559,7 +541,6 @@ convert.c
 convert.h
 cp/call.c
 cp/class.c
-cp/class.h
 cp/cp-tree.h
 cp/cvt.c
 cp/decl.c
@@ -594,7 +575,7 @@ cp/tree.c
 cp/typeck.c
 cp/typeck2.c
 cp/xref.c
-cplus-dem.c
+../libiberty/cplus-dem.c
 cppalloc.c
 cpperror.c
 cppexp.c
@@ -608,7 +589,7 @@ cse.c
 dbxout.c
 dbxstclass.h
 defaults.h
-demangle.h
+../include/demangle.h
 doschk.c
 dwarf.h
 dwarf2.h
@@ -651,9 +632,9 @@ gcov.c
 #genoutput.c is used only by GCC maintainers and installers
 #genpeep.c is used only by GCC maintainers and installers
 #genrecog.c is used only by GCC maintainers and installers
-getopt.c
-getopt.h
-getopt1.c
+../libiberty/getopt.c
+../include/getopt.h
+../libiberty/getopt1.c
 getpwd.c
 ginclude/iso646.h
 ginclude/math-3300.h
@@ -725,49 +706,13 @@ loop.h
 machmode.h
 #mips-tdump.c is not yet internationalized
 #mips-tfile.c is not yet internationalized
-objc/NXConstStr.h
-objc/Object.h
-objc/Protocol.h
-objc/archive.c
-objc/class.c
-objc/encoding.c
-objc/encoding.h
-objc/hash.c
-objc/hash.h
-objc/init.c
-objc/libobjc_entry.c
-objc/misc.c
-objc/nil_method.c
 objc/objc-act.c
 objc/objc-act.h
-objc/objc-api.h
-objc/objc-list.h
 objc/objc-parse.c
-objc/objc.h
-objc/objects.c
-objc/runtime.h
-objc/sarray.c
-objc/sarray.h
-objc/selector.c
-objc/sendmsg.c
-objc/thr-decosf1.c
-objc/thr-irix.c
-objc/thr-mach.c
-objc/thr-os2.c
-objc/thr-posix.c
-objc/thr-pthreads.c
-objc/thr-single.c
-objc/thr-solaris.c
-objc/thr-win32.c
-objc/thr.c
-objc/thr.h
-objc/typedstream.h
-obstack.c
-obstack.h
 optabs.c
 output.h
 pcp.h
-pexecute.c
+../libiberty/pexecute.c
 #po/cat-id-tbl.c contains the translation tables themselves
 prefix.c
 print-rtl.c