[src/trunk]: src/gnu Remove local ENABLE_NLS patches which were added for sma...

[wiz <wiz%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/48dab686e459
branches:  trunk
changeset: 551585:48dab686e459
user:      wiz <wiz%NetBSD.org@localhost>
date:      Mon Sep 08 13:33:00 2003 +0000

description:
Remove local ENABLE_NLS patches which were added for smaller executable
size -- however, these binaries won't end up on bot floppies, so it's
not necessary, and less diffs to the original are better.
Ok'd by itojun.

diffstat:

 gnu/dist/texinfo/info/info.c         |   4 +---
 gnu/dist/texinfo/makeinfo/makeinfo.c |   4 +---
 gnu/dist/texinfo/util/install-info.c |   4 +---
 gnu/dist/texinfo/util/texindex.c     |   4 +---
 gnu/usr.bin/texinfo/Makefile.inc     |   4 +---
 gnu/usr.bin/texinfo/common/config.h  |  11 +----------
 6 files changed, 6 insertions(+), 25 deletions(-)

diffs (125 lines):

diff -r 49886c88db38 -r 48dab686e459 gnu/dist/texinfo/info/info.c
--- a/gnu/dist/texinfo/info/info.c      Mon Sep 08 13:13:08 2003 +0000
+++ b/gnu/dist/texinfo/info/info.c      Mon Sep 08 13:33:00 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: info.c,v 1.8 2003/07/03 15:09:16 wiz Exp $     */
+/*     $NetBSD: info.c,v 1.9 2003/09/08 13:33:00 wiz Exp $     */
 
 /* info.c -- Display nodes of Info files in multiple windows.
    Id: info.c,v 1.7 2003/05/19 13:10:59 karl Exp
@@ -155,11 +155,9 @@
   setlocale (LC_ALL, "");
 #endif
 
-#ifdef ENABLE_NLS
   /* Set the text message domain.  */
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
-#endif
 
   init_messages ();
 
diff -r 49886c88db38 -r 48dab686e459 gnu/dist/texinfo/makeinfo/makeinfo.c
--- a/gnu/dist/texinfo/makeinfo/makeinfo.c      Mon Sep 08 13:13:08 2003 +0000
+++ b/gnu/dist/texinfo/makeinfo/makeinfo.c      Mon Sep 08 13:33:00 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: makeinfo.c,v 1.9 2003/07/03 15:09:19 wiz Exp $ */
+/*     $NetBSD: makeinfo.c,v 1.10 2003/09/08 13:33:01 wiz Exp $        */
 
 /* makeinfo -- convert Texinfo source into other formats.
    Id: makeinfo.c,v 1.34 2003/06/02 12:32:29 karl Exp
@@ -554,11 +554,9 @@
   setlocale (LC_COLLATE, "");
 #endif
 
-#ifdef ENABLE_NLS
   /* Set the text message domain.  */
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
-#endif
 
   /* Parse argument flags from the input line. */
   while ((c = getopt_long (argc, argv, "D:de:E:f:hI:o:p:P:r:s:U:vV:wx",
diff -r 49886c88db38 -r 48dab686e459 gnu/dist/texinfo/util/install-info.c
--- a/gnu/dist/texinfo/util/install-info.c      Mon Sep 08 13:13:08 2003 +0000
+++ b/gnu/dist/texinfo/util/install-info.c      Mon Sep 08 13:33:00 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: install-info.c,v 1.6 2003/07/03 15:09:21 wiz Exp $     */
+/*     $NetBSD: install-info.c,v 1.7 2003/09/08 13:33:02 wiz Exp $     */
 
 /* install-info -- create Info directory entry(ies) for an Info file.
    Id: install-info.c,v 1.9 2003/05/19 13:10:59 karl Exp
@@ -1126,11 +1126,9 @@
   setlocale (LC_ALL, "");
 #endif
 
-#ifdef ENABLE_NLS
   /* Set the text message domain.  */
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
-#endif
 
   while (1)
     {
diff -r 49886c88db38 -r 48dab686e459 gnu/dist/texinfo/util/texindex.c
--- a/gnu/dist/texinfo/util/texindex.c  Mon Sep 08 13:13:08 2003 +0000
+++ b/gnu/dist/texinfo/util/texindex.c  Mon Sep 08 13:33:00 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: texindex.c,v 1.6 2003/07/03 15:09:22 wiz Exp $ */
+/*     $NetBSD: texindex.c,v 1.7 2003/09/08 13:33:03 wiz Exp $ */
 
 /* texindex -- sort TeX index dribble output into an actual index.
    Id: texindex.c,v 1.9 2003/05/19 13:10:59 karl Exp
@@ -162,11 +162,9 @@
   setlocale (LC_ALL, "");
 #endif
 
-#ifdef ENABLE_NLS
   /* Set the text message domain.  */
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
-#endif
 
   /* In case we write to a redirected stdout that fails.  */
   /* not ready atexit (close_stdout); */
diff -r 49886c88db38 -r 48dab686e459 gnu/usr.bin/texinfo/Makefile.inc
--- a/gnu/usr.bin/texinfo/Makefile.inc  Mon Sep 08 13:13:08 2003 +0000
+++ b/gnu/usr.bin/texinfo/Makefile.inc  Mon Sep 08 13:33:00 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.7 2003/01/17 15:32:23 wiz Exp $
+#      $NetBSD: Makefile.inc,v 1.8 2003/09/08 13:33:03 wiz Exp $
 
 .if !defined(__MAKEFILE_INC_INCLUDED__)
 __MAKEFILE_INC_INCLUDED__=1
@@ -14,10 +14,8 @@
 DPADD+=                ${LIBCOMMONDIR}/libcommon.a
 LDADD+=                -L${LIBCOMMONDIR} -lcommon
 
-# libintl-less build should comment the following 3 lines out
 DPADD+=                ${LIBINTL}
 LDADD+=                -lintl
-CPPFLAGS+=     -DENABLE_NLS=1 -DHAVE_GETTEXT=1 -DHAVE_LIBINTL_H=1
 
 LIBCOMMONDIR!= cd ${.CURDIR}/../common && ${PRINTOBJDIR}
 
diff -r 49886c88db38 -r 48dab686e459 gnu/usr.bin/texinfo/common/config.h
--- a/gnu/usr.bin/texinfo/common/config.h       Mon Sep 08 13:13:08 2003 +0000
+++ b/gnu/usr.bin/texinfo/common/config.h       Mon Sep 08 13:33:00 2003 +0000
@@ -11,16 +11,7 @@
 
 /* Define to 1 if translation of program messages to the user's native
    language is requested. */
-/* For gettext (NLS) */
-/* #undef ENABLE_NLS */
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#define _(String) gettext (String)
-#define N_(String) (String)
-#else
-#define _(String) (String)
-#define N_(String) (String)
-#endif
+#define ENABLE_NLS 1
 
 /* Define to 1 if `TIOCGWINSZ' requires <sys/ioctl.h>. */
 /* #undef GWINSZ_IN_SYS_IOCTL */