From 19ac4b08f0d03f6141cdebb65887e31b32ec3412 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 22 Apr 1998 07:58:44 +0000 Subject: [PATCH] * Makefile.am (INCLUDES): Search intl dirs for headers; define LOCALEDIR. * addr2line.c (main): Call setlocale, bindtextdomain, textdomain. * ar.c (main): Likewise. * coffdump.c (main): Likewise. * dlltool.c (main): Likewise. * nlmconv.c (main): Likewise. * nm.c (main): Likewise. * objcopy.c (main): Likewise. * objdump.c (main): Likewise. * size.c (main): Likewise. * srconv.c (main): Likewise. * strings.c (main): Likewise. * sysdump.c (main): Likewise. * windres.c (main): Likewise. --- binutils/ChangeLog | 18 ++++++++++++++++++ binutils/Makefile.am | 5 ++++- binutils/Makefile.in | 4 +++- binutils/addr2line.c | 4 ++++ binutils/ar.c | 4 ++++ binutils/coffdump.c | 4 ++++ binutils/dlltool.c | 4 ++++ binutils/nlmconv.c | 4 ++++ binutils/nm.c | 4 ++++ binutils/objcopy.c | 4 ++++ binutils/objdump.c | 4 ++++ binutils/size.c | 4 ++++ binutils/srconv.c | 6 +++++- binutils/strings.c | 4 ++++ binutils/sysdump.c | 4 ++++ binutils/windres.c | 4 ++++ 16 files changed, 78 insertions(+), 3 deletions(-) diff --git a/binutils/ChangeLog b/binutils/ChangeLog index 20985cf6c20..f73012fa273 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,21 @@ +Wed Apr 22 00:33:56 1998 Tom Tromey + + * Makefile.am (INCLUDES): Search intl dirs for headers; define + LOCALEDIR. + * addr2line.c (main): Call setlocale, bindtextdomain, textdomain. + * ar.c (main): Likewise. + * coffdump.c (main): Likewise. + * dlltool.c (main): Likewise. + * nlmconv.c (main): Likewise. + * nm.c (main): Likewise. + * objcopy.c (main): Likewise. + * objdump.c (main): Likewise. + * size.c (main): Likewise. + * srconv.c (main): Likewise. + * strings.c (main): Likewise. + * sysdump.c (main): Likewise. + * windres.c (main): Likewise. + Tue Apr 21 22:13:08 1998 Tom Tromey * Many files: Added gettext invocations around user-visible diff --git a/binutils/Makefile.am b/binutils/Makefile.am index b0396b61f2d..8be4f7b8c83 100644 --- a/binutils/Makefile.am +++ b/binutils/Makefile.am @@ -1,5 +1,8 @@ ## Process this file with automake to generate Makefile.in +## FIXME: Work around apparent bug in automake. +INTLLIBS = @INTLLIBS@ + AUTOMAKE_OPTIONS = cygnus dejagnu SUBDIRS = po @@ -64,7 +67,7 @@ INCDIR = $(BASEDIR)/include DEP = mkdep -INCLUDES = -D_GNU_SOURCE -I. -I$(srcdir) -I../bfd -I$(BFDDIR) -I$(INCDIR) @HDEFINES@ +INCLUDES = -D_GNU_SOURCE -I. -I$(srcdir) -I../bfd -I$(BFDDIR) -I$(INCDIR) @HDEFINES@ -I$(srcdir)/../intl -I../intl -DLOCALEDIR="\"$(prefix)/share/locale\"" HFILES = arsup.h bucomm.h budbg.h coffgrok.h debug.h nlmconv.h dlltool.h \ windres.h diff --git a/binutils/Makefile.in b/binutils/Makefile.in index b9483ab6d76..78b45b844fe 100644 --- a/binutils/Makefile.in +++ b/binutils/Makefile.in @@ -77,6 +77,8 @@ NLMCONV_DEFS = @NLMCONV_DEFS@ RANLIB = @RANLIB@ UNDERSCORE = @UNDERSCORE@ +INTLLIBS = @INTLLIBS@ + AUTOMAKE_OPTIONS = cygnus dejagnu SUBDIRS = po @@ -137,7 +139,7 @@ INCDIR = $(BASEDIR)/include DEP = mkdep -INCLUDES = -D_GNU_SOURCE -I. -I$(srcdir) -I../bfd -I$(BFDDIR) -I$(INCDIR) @HDEFINES@ +INCLUDES = -D_GNU_SOURCE -I. -I$(srcdir) -I../bfd -I$(BFDDIR) -I$(INCDIR) @HDEFINES@ -I$(srcdir)/../intl -I../intl -DLOCALEDIR="\"$(prefix)/share/locale\"" HFILES = arsup.h bucomm.h budbg.h coffgrok.h debug.h nlmconv.h dlltool.h \ windres.h diff --git a/binutils/addr2line.c b/binutils/addr2line.c index 3d4ff903556..7a55df3e977 100644 --- a/binutils/addr2line.c +++ b/binutils/addr2line.c @@ -270,6 +270,10 @@ main (argc, argv) char *target; int c; + setlocale (LC_MESSAGES, ""); + bindtextdomain (PACKAGE, LOCALEDIR); + textdomain (PACKAGE); + program_name = *argv; xmalloc_set_program_name (program_name); diff --git a/binutils/ar.c b/binutils/ar.c index a8fdebf1014..7141f42a2e8 100644 --- a/binutils/ar.c +++ b/binutils/ar.c @@ -311,6 +311,10 @@ main (argc, argv) char *inarch_filename; int show_version; + setlocale (LC_MESSAGES, ""); + bindtextdomain (PACKAGE, LOCALEDIR); + textdomain (PACKAGE); + program_name = argv[0]; xmalloc_set_program_name (program_name); diff --git a/binutils/coffdump.c b/binutils/coffdump.c index 12f634424ff..64815fbeb33 100644 --- a/binutils/coffdump.c +++ b/binutils/coffdump.c @@ -485,6 +485,10 @@ main (ac, av) { NULL, no_argument, 0, 0 } }; + setlocale (LC_MESSAGES, ""); + bindtextdomain (PACKAGE, LOCALEDIR); + textdomain (PACKAGE); + program_name = av[0]; xmalloc_set_program_name (program_name); diff --git a/binutils/dlltool.c b/binutils/dlltool.c index 78ff1abbb01..07d5ec68e8e 100644 --- a/binutils/dlltool.c +++ b/binutils/dlltool.c @@ -2304,6 +2304,10 @@ main (ac, av) program_name = av[0]; oav = av; + setlocale (LC_MESSAGES, ""); + bindtextdomain (PACKAGE, LOCALEDIR); + textdomain (PACKAGE); + while ((c = getopt_long (ac, av, "xcz:S:R:A:puaD:l:e:nkvbUh?m:yd:", long_options, 0)) != EOF) { diff --git a/binutils/nlmconv.c b/binutils/nlmconv.c index 8544ba0e4f9..2eaaa9f5473 100644 --- a/binutils/nlmconv.c +++ b/binutils/nlmconv.c @@ -210,6 +210,10 @@ main (argc, argv) char *modname; char **matching; + setlocale (LC_MESSAGES, ""); + bindtextdomain (PACKAGE, LOCALEDIR); + textdomain (PACKAGE); + program_name = argv[0]; xmalloc_set_program_name (program_name); diff --git a/binutils/nm.c b/binutils/nm.c index 204c6a2f0cc..3dcdc29119c 100644 --- a/binutils/nm.c +++ b/binutils/nm.c @@ -372,6 +372,10 @@ main (argc, argv) int c; int retval; + setlocale (LC_MESSAGES, ""); + bindtextdomain (PACKAGE, LOCALEDIR); + textdomain (PACKAGE); + program_name = *argv; xmalloc_set_program_name (program_name); diff --git a/binutils/objcopy.c b/binutils/objcopy.c index b9da0c99113..c1d48c612ff 100644 --- a/binutils/objcopy.c +++ b/binutils/objcopy.c @@ -2155,6 +2155,10 @@ main (argc, argv) int argc; char *argv[]; { + setlocale (LC_MESSAGES, ""); + bindtextdomain (PACKAGE, LOCALEDIR); + textdomain (PACKAGE); + program_name = argv[0]; xmalloc_set_program_name (program_name); diff --git a/binutils/objdump.c b/binutils/objdump.c index 29c440eeb6e..ececdef6e91 100644 --- a/binutils/objdump.c +++ b/binutils/objdump.c @@ -2627,6 +2627,10 @@ main (argc, argv) char *target = default_target; boolean seenflag = false; + setlocale (LC_MESSAGES, ""); + bindtextdomain (PACKAGE, LOCALEDIR); + textdomain (PACKAGE); + program_name = *argv; xmalloc_set_program_name (program_name); diff --git a/binutils/size.c b/binutils/size.c index 4ed35555879..9bd8a453dfc 100644 --- a/binutils/size.c +++ b/binutils/size.c @@ -107,6 +107,10 @@ main (argc, argv) int temp; int c; + setlocale (LC_MESSAGES, ""); + bindtextdomain (PACKAGE, LOCALEDIR); + textdomain (PACKAGE); + program_name = *argv; xmalloc_set_program_name (program_name); diff --git a/binutils/srconv.c b/binutils/srconv.c index 098a6d415a9..bd1ea6521f8 100644 --- a/binutils/srconv.c +++ b/binutils/srconv.c @@ -1917,8 +1917,12 @@ main (ac, av) }; char **matching; char *input_file; - char *output_file; + + setlocale (LC_MESSAGES, ""); + bindtextdomain (PACKAGE, LOCALEDIR); + textdomain (PACKAGE); + program_name = av[0]; xmalloc_set_program_name (program_name); diff --git a/binutils/strings.c b/binutils/strings.c index 5cf573a123b..20fa6c8a934 100644 --- a/binutils/strings.c +++ b/binutils/strings.c @@ -122,6 +122,10 @@ main (argc, argv) int exit_status = 0; boolean files_given = false; + setlocale (LC_MESSAGES, ""); + bindtextdomain (PACKAGE, LOCALEDIR); + textdomain (PACKAGE); + program_name = argv[0]; xmalloc_set_program_name (program_name); string_min = -1; diff --git a/binutils/sysdump.c b/binutils/sysdump.c index ed365b4221e..38630312c51 100644 --- a/binutils/sysdump.c +++ b/binutils/sysdump.c @@ -745,6 +745,10 @@ main (ac, av) {NULL, no_argument, 0, 0} }; + setlocale (LC_MESSAGES, ""); + bindtextdomain (PACKAGE, LOCALEDIR); + textdomain (PACKAGE); + program_name = av[0]; xmalloc_set_program_name (program_name); diff --git a/binutils/windres.c b/binutils/windres.c index b4a17df3778..0f07357172c 100644 --- a/binutils/windres.c +++ b/binutils/windres.c @@ -846,6 +846,10 @@ main (argc, argv) int language; struct res_directory *resources; + setlocale (LC_MESSAGES, ""); + bindtextdomain (PACKAGE, LOCALEDIR); + textdomain (PACKAGE); + program_name = argv[0]; xmalloc_set_program_name (program_name); -- 2.30.2