[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
neither getopt.c nor regex.c honors ENABLE_NLS
From: |
Jim Meyering |
Subject: |
neither getopt.c nor regex.c honors ENABLE_NLS |
Date: |
Sun, 21 Oct 2001 15:45:24 +0200 |
User-agent: |
Gnus/5.090004 (Oort Gnus v0.04) Emacs/21.0.107 |
I wrote:
> This showed up as a link error on a Unixware system when I
> configure/build fileutils with --disable-nls. That system had libintl.h,
> but no gettext function in the libraries I was using.
>
> 2001-10-21 Jim Meyering <address@hidden>
>
> * malloc/obstack.c (_): Honor the setting of ENABLE_NLS. Otherwise,
> this code would end up calling gettext even in packages built
> with --disable-nls.
The same apply to getopt.c and regex.c:
The problem with getopt.c arose on an SGI/Irix system.
* posix/getopt.c (_): Likewise.
* posix/regex.c (_): Likewise.
Index: getopt.c
===================================================================
RCS file: /cvs/glibc/libc/posix/getopt.c,v
retrieving revision 1.47
diff -u -p -u -p -r1.47 getopt.c
--- getopt.c 2001/08/17 04:48:16 1.47
+++ getopt.c 2001/10/21 13:43:12
@@ -78,7 +78,7 @@
#ifndef _
/* This is for other GNU distributions with internationalized messages. */
-# if defined HAVE_LIBINTL_H || defined _LIBC
+# if (HAVE_LIBINTL_H && ENABLE_NLS) || defined _LIBC
# include <libintl.h>
# ifndef _
# define _(msgid) gettext (msgid)
Index: regex.c
===================================================================
RCS file: /cvs/glibc/libc/posix/regex.c,v
retrieving revision 1.112
diff -u -p -u -p -r1.112 regex.c
--- regex.c 2001/08/21 02:39:40 1.112
+++ regex.c 2001/10/21 13:43:21
@@ -91,7 +91,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