* 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.

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 20985cf6c203b92e9699bf03dbd1ed3ac0824ba2..f73012fa27322d1f4a839aafcc00af6e2d1928a6 100644 (file)
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,21 @@
+Wed Apr 22 00:33:56 1998  Tom Tromey  <tromey@scribbles.cygnus.com>
+
+       * 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  <tromey@scribbles.cygnus.com>
 
        * Many files: Added gettext invocations around user-visible

diff --git a/binutils/Makefile.am b/binutils/Makefile.am
index b0396b61f2d48dd979e2172d6cd51e353a38d50c..8be4f7b8c8389269d57a00d1ca0a98e983b8415b 100644 (file)
--- 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 b9483ab6d7602ef42fb4ecaf3179cccc57233f64..78b45b844fe146505f51098eff167049a56dca8c 100644 (file)
--- 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 3d4ff90355616ae8e9e0d38d9384fea815a6383f..7a55df3e97771ce38a1196d306490c9d9df38315 100644 (file)
--- 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 a8fdebf1014462cad5b0dce85168e998471c431a..7141f42a2e849ab8b217af3d481456dd3d25fdad 100644 (file)
--- 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 12f634424ff0d180f020c1ebd89d757ec6f506b6..64815fbeb3324a81c1d68026d9448fb455ff0908 100644 (file)
--- 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 78ff1abbb01d208819a3217a0d94505b1bf80023..07d5ec68e8e26ff239dbd0adca33feebd0617523 100644 (file)
--- 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 8544ba0e4f99a415dae7072580f74f3a371d4f50..2eaaa9f54735bd0dba898699ce8ce95cd47e7f5a 100644 (file)
--- 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 204c6a2f0cc0e949918fa42d2a0a8df0b3f9f65e..3dcdc29119c9e075a51c185322d01788f1d2d54c 100644 (file)
--- 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 b9da0c991139d89cb74ad8c20e1a40f1f5ea003c..c1d48c612ff214dcf4f9bb0b19cf442de73ab5fb 100644 (file)
--- 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 29c440eeb6eb86753a54104c66fbced2e5911061..ececdef6e9188ec90238e21600f062d77f102482 100644 (file)
--- 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 4ed355558798dcdfc412dab9cf0af8977202467e..9bd8a453dfcf3fe9e95c715f7c89acd9e9a2db06 100644 (file)
--- 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 098a6d415a9f154b28ecaf0bd76b5400a2f1b3d2..bd1ea6521f8680fe183accf427f7578b371a9a62 100644 (file)
--- 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 5cf573a123b175be2c026deff507299dfb3a0cc8..20fa6c8a9349a5e428b401ddfd0dfabb42802317 100644 (file)
--- 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 ed365b4221e4cba886f7c1ea5dc0b8a65c97225a..38630312c513e135ca7204398523d9f34e9e1dd4 100644 (file)
--- 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 b4a17df3778d6968ced9a0c8676327def611bb2e..0f07357172c1228c9a1076bc9ff07460949524b3 100644 (file)
--- 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);