2001-11-12 Jim Meyering <[email protected]>

* obstack.c (_): Honor the setting of ENABLE_NLS. Otherwise, this code would end up calling gettext even in packages built with --disable-nls. * getopt.c (_): Likewise. * regex.c (_): Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@46975 138bc75d-0d04-0410-961f-82ee72b054a4
ToninoTarsi · Nov 13, 2001 · 448378f · 448378f
1 parent 2d051b8
commit 448378f
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
@@ -1,3 +1,11 @@
+2001-11-12  Jim Meyering  <[email protected]>
+
+	* obstack.c (_): Honor the setting of ENABLE_NLS.  Otherwise,
+	this code would end up calling gettext even in packages built
+	with --disable-nls.
+	* getopt.c (_): Likewise.
+	* regex.c (_): Likewise.
+
 2001-11-03  Alan Modra  <[email protected]>
 
 	* configure.in: Cope with missing makeinfo.

diff --git a/libiberty/getopt.c b/libiberty/getopt.c
@@ -82,7 +82,7 @@
 #ifndef _
 /* This is for other GNU distributions with internationalized messages.
    When compiling libc, the _ macro is predefined.  */
-# ifdef HAVE_LIBINTL_H
+# if (HAVE_LIBINTL_H && ENABLE_NLS) || defined _LIBC
 #  include <libintl.h>
 #  define _(msgid)	gettext (msgid)
 # else

diff --git a/libiberty/obstack.c b/libiberty/obstack.c
@@ -451,7 +451,7 @@ _obstack_memory_used (h)
 
 /* Define the error handler.  */
 #ifndef _
-# ifdef HAVE_LIBINTL_H
+# if (HAVE_LIBINTL_H && ENABLE_NLS) || defined _LIBC
 #  include <libintl.h>
 #  ifndef _
 #   define _(Str) gettext (Str)

diff --git a/libiberty/regex.c b/libiberty/regex.c
@@ -95,7 +95,7 @@
 # endif
 
 /* This is for other GNU distributions with internationalized messages.  */
-# if HAVE_LIBINTL_H || defined _LIBC
+# if (HAVE_LIBINTL_H && ENABLE_NLS) || defined _LIBC
 #  include <libintl.h>
 #  ifdef _LIBC
 #   undef gettext