obstack.c (_): Honor the setting of ENABLE_NLS.

2001-11-12  Jim Meyering  <meyering@lucent.com>

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

From-SVN: r46975
This commit is contained in:
Jim Meyering 2001-11-13 03:46:00 +00:00 committed by DJ Delorie
parent 77e653add2
commit 2e68303737
4 changed files with 11 additions and 3 deletions

View File

@ -1,3 +1,11 @@
2001-11-12 Jim Meyering <meyering@lucent.com>
* 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 <amodra@bigpond.net.au>
* configure.in: Cope with missing makeinfo.

View File

@ -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

View File

@ -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)

View File

@ -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