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

16 files changed, 78 insertions, 3 deletions

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 20985cf..f73012f 100644
--- 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 b0396b6..8be4f7b 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 b9483ab..78b45b8 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 3d4ff90..7a55df3 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 a8fdebf..7141f42 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 12f6344..64815fb 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 78ff1ab..07d5ec6 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 8544ba0..2eaaa9f 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 204c6a2..3dcdc29 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 b9da0c9..c1d48c6 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 29c440e..ececdef 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 4ed3555..9bd8a45 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 098a6d4..bd1ea65 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 5cf573a..20fa6c8 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 ed365b4..3863031 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 b4a17df..0f07357 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);