Add comment describoing why dgettext() is used in _() macro.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 03fc856ff33a6043efdb94fb9a5e6deed53a9562..798ed4d58d0020f221e87cfa62147e580b48f664 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2000-05-31  Nick Clifton  <nickc@cygnus.com>
+
+       * opintl.h (_(String)): Explain why dgettext is used instead
+       of gettext. 
+
 2000-05-31  Ulrich Drepper  <drepper@redhat.com>
 
        * elf.c (_bfd_elf_slurp_version_tables): Correct reading of version

diff --git a/bfd/sysdep.h b/bfd/sysdep.h
index 77b5e50a9c3e0c0b51fb4a809c17f41baa936b08..bf3eac03ccb7827237706d636137b7584363b121 100644 (file)
--- a/bfd/sysdep.h
+++ b/bfd/sysdep.h
@@ -126,6 +126,18 @@ extern char *getenv ();
 
 #ifdef ENABLE_NLS
 #include <libintl.h>
+/* Note the use of dgetext() and PACKAGE here, rather than gettext().
+   
+   This is because the code in this directory is used to build a library which
+   will be linked with code in other directories to form programs.  We want to
+   maintain a seperate translation file for this directory however, rather
+   than being forced to merge it with that of any program linked to libbfd.
+   This is a library, so it cannot depend on the catalog currently loaded.
+
+   In order to do this, we have to make sure that when we extract messages we
+   use the OPCODES domain rather than the domain of the program that included
+   the bfd library, (eg OBJDUMP).  Hence we use dgettext (PACKAGE, String)
+   and define PACKAGE to be 'bfd'.  (See the code in configure).  */
 #define _(String) dgettext (PACKAGE, String)
 #ifdef gettext_noop
 #define N_(String) gettext_noop (String)

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 08b2c16749e40d02633edca548996f6daf6b10e8..a2c890f86a5060315c12616bedb4c7a5bd10b028 100644 (file)
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,8 @@
+2000-05-31  Nick Clifton  <nickc@cygnus.com>
+
+       * opintl.h (_(String)): Explain why dgettext is used instead of
+       gettext.
+
 2000-05-30  Nick Clifton  <nickc@cygnus.com>
 
        * opintl.h (gettext, dgettext, dcgettext, textdomain,

diff --git a/opcodes/opintl.h b/opcodes/opintl.h
index 55a989a53ba93aae92ad76ffec50ac518b16cf03..492fc1a6c897dfce387140082b4ac5c7d61b4ca8 100644 (file)
--- a/opcodes/opintl.h
+++ b/opcodes/opintl.h
@@ -12,6 +12,19 @@
 
 #ifdef ENABLE_NLS
 # include <libintl.h>
+/* Note the use of dgetext() and PACKAGE here, rather than gettext().
+   
+   This is because the code in this directory is used to build a library which
+   will be linked with code in other directories to form programs.  We want to
+   maintain a seperate translation file for this directory however, rather
+   than being forced to merge it with that of any program linked to
+   libopcodes.  This is a library, so it cannot depend on the catalog
+   currently loaded.
+
+   In order to do this, we have to make sure that when we extract messages we
+   use the OPCODES domain rather than the domain of the program that included
+   the opcodes library, (eg OBJDUMP).  Hence we use dgettext (PACKAGE, String)
+   and define PACKAGE to be 'opcodes'.  (See the code in configure).  */
 # define _(String) dgettext (PACKAGE, String)
 # ifdef gettext_noop
 #  define N_(String) gettext_noop (String)