From e1eb172980301c54829d4de3753f9eff41aac7fc Mon Sep 17 00:00:00 2001
From: "Andrey A. Chernov" <ache@FreeBSD.org>
Date: Sun, 11 Jun 2000 03:26:08 +0000
Subject: [PATCH] Activate Japanese NLS and KANJI support

---
 bin/csh/Makefile     | 3 ---
 bin/csh/config.h     | 2 --
 bin/csh/config_p.h   | 2 --
 bin/csh/nls/Makefile | 6 +-----
 4 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/bin/csh/Makefile b/bin/csh/Makefile
index 9eb9c7ef3f7a..61d096f32012 100644
--- a/bin/csh/Makefile
+++ b/bin/csh/Makefile
@@ -12,9 +12,6 @@ TCSHDIR= ${.CURDIR}/../../contrib/tcsh
 PROG=	csh
 SUBDIR= nls
 DFLAGS=	-D_PATH_TCSHELL='"${DESTDIR}/bin/${PROG}"'  
-.if defined(WANT_KANJI)
-DFLAGS+= -DWANT_KANJI
-.endif
 CFLAGS+= -I${TCSHDIR} -I${.CURDIR} -I. ${DFLAGS}
 SRCS=	sh.c sh.dir.c sh.dol.c sh.err.c sh.exec.c sh.char.c \
 	sh.exp.c sh.file.c sh.func.c sh.glob.c sh.hist.c sh.init.c \
diff --git a/bin/csh/config.h b/bin/csh/config.h
index 23a25859c190..836e5d4e87d4 100644
--- a/bin/csh/config.h
+++ b/bin/csh/config.h
@@ -153,10 +153,8 @@
 # define NLS_CATALOGS
 #endif
 
-#ifdef WANT_KANJI
 #define KANJI
 #define DSPMBYTE
-#endif
 
 #endif /* _h_config */
 /* config.h.in.  Generated automatically from configure.in by autoheader.  */
diff --git a/bin/csh/config_p.h b/bin/csh/config_p.h
index 23a25859c190..836e5d4e87d4 100644
--- a/bin/csh/config_p.h
+++ b/bin/csh/config_p.h
@@ -153,10 +153,8 @@
 # define NLS_CATALOGS
 #endif
 
-#ifdef WANT_KANJI
 #define KANJI
 #define DSPMBYTE
-#endif
 
 #endif /* _h_config */
 /* config.h.in.  Generated automatically from configure.in by autoheader.  */
diff --git a/bin/csh/nls/Makefile b/bin/csh/nls/Makefile
index dc874d5aa53b..9f1e4c5377bb 100644
--- a/bin/csh/nls/Makefile
+++ b/bin/csh/nls/Makefile
@@ -1,10 +1,6 @@
 # $FreeBSD$
 
-SUBDIR= finnish french german italian spanish
-
-.if defined(WANT_KANJI)
-SUBDIR+= ja
-.endif
+SUBDIR= finnish french ja german italian spanish
 
 # We are not ready for greek yet
 #SUBDIR+= greek