summaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorwiz <wiz@NetBSD.org>2003-09-08 13:33:00 +0000
committerwiz <wiz@NetBSD.org>2003-09-08 13:33:00 +0000
commit38f443bb93ab194eee40dcc93048c0fff910e1fa (patch)
treef3d5b2c2f7cf274c74b6e70502f1d5e7d8bca8ca /gnu
parent29119d0e3b75dc090c8d4ed54aa6725a5d45a2d5 (diff)
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 (limited to 'gnu')
-rw-r--r--gnu/dist/texinfo/info/info.c4
-rw-r--r--gnu/dist/texinfo/makeinfo/makeinfo.c4
-rw-r--r--gnu/dist/texinfo/util/install-info.c4
-rw-r--r--gnu/dist/texinfo/util/texindex.c4
-rw-r--r--gnu/usr.bin/texinfo/Makefile.inc4
-rw-r--r--gnu/usr.bin/texinfo/common/config.h11
6 files changed, 6 insertions, 25 deletions
diff --git a/gnu/dist/texinfo/info/info.c b/gnu/dist/texinfo/info/info.c
index cad08c9f30d..90a3deab4d0 100644
--- a/gnu/dist/texinfo/info/info.c
+++ b/gnu/dist/texinfo/info/info.c
@@ -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 @@ main (argc, argv)
setlocale (LC_ALL, "");
#endif
-#ifdef ENABLE_NLS
/* Set the text message domain. */
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
-#endif
init_messages ();
diff --git a/gnu/dist/texinfo/makeinfo/makeinfo.c b/gnu/dist/texinfo/makeinfo/makeinfo.c
index ea082247e6b..d0322ecb8d0 100644
--- a/gnu/dist/texinfo/makeinfo/makeinfo.c
+++ b/gnu/dist/texinfo/makeinfo/makeinfo.c
@@ -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 @@ main (argc, argv)
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 --git a/gnu/dist/texinfo/util/install-info.c b/gnu/dist/texinfo/util/install-info.c
index a9c1a281ca5..87a5da6fe80 100644
--- a/gnu/dist/texinfo/util/install-info.c
+++ b/gnu/dist/texinfo/util/install-info.c
@@ -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 @@ main (argc, argv)
setlocale (LC_ALL, "");
#endif
-#ifdef ENABLE_NLS
/* Set the text message domain. */
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
-#endif
while (1)
{
diff --git a/gnu/dist/texinfo/util/texindex.c b/gnu/dist/texinfo/util/texindex.c
index 2b3a2124349..a19b1d88b00 100644
--- a/gnu/dist/texinfo/util/texindex.c
+++ b/gnu/dist/texinfo/util/texindex.c
@@ -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 @@ main (argc, argv)
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 --git a/gnu/usr.bin/texinfo/Makefile.inc b/gnu/usr.bin/texinfo/Makefile.inc
index 0116405cd7a..e57657497a2 100644
--- a/gnu/usr.bin/texinfo/Makefile.inc
+++ b/gnu/usr.bin/texinfo/Makefile.inc
@@ -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 @@ CPPFLAGS+= -I${.CURDIR}/../common -I${IDIST}/lib \
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 --git a/gnu/usr.bin/texinfo/common/config.h b/gnu/usr.bin/texinfo/common/config.h
index 29f0a5648b4..b1aa91f59fa 100644
--- a/gnu/usr.bin/texinfo/common/config.h
+++ b/gnu/usr.bin/texinfo/common/config.h
@@ -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 */