KANJI and DSPMBYTE are now "on" by default in the tcsh 6.13.00 distribution.

2 files changed, 34 insertions, 24 deletions

diff --git a/bin/csh/config.h b/bin/csh/config.h
index 9e91642..e82478e 100644
--- a/bin/csh/config.h
+++ b/bin/csh/config.h
@@ -1,4 +1,4 @@
-/* config.h.  Generated automatically by configure.  */
+/* config.h.  Generated by configure.  */
 /*
  * config.h -- configure various defines for tcsh
  *
@@ -29,14 +29,14 @@
 /* #undef POSIXSIGS */
 
 /*
- * VFORK	This machine has a vfork().  
+ * VFORK	This machine has a vfork().
  *		It used to be that for job control to work, this define
  *		was mandatory. This is not the case any more.
- *		If you think you still need it, but you don't have vfork, 
- *		define this anyway and then do #define vfork fork.  
+ *		If you think you still need it, but you don't have vfork,
+ *		define this anyway and then do #define vfork fork.
  *		I do this anyway on a Sun because of yellow pages brain damage,
  *		[should not be needed under 4.1]
- *		and on the iris4d cause	SGI's fork is sufficiently "virtual" 
+ *		and on the iris4d cause	SGI's fork is sufficiently "virtual"
  *		that vfork isn't necessary.  (Besides, SGI's vfork is weird).
  *		Note that some machines eg. rs6000 have a vfork, but not
  *		with the berkeley semantics, so we cannot use it there either.
@@ -101,7 +101,7 @@
  * SIGVOID	Define this if your signal handlers return void.  On older
  *		systems, signal returns int, but on newer ones, it returns void.
  */
-#define SIGVOID 
+#define SIGVOID
 
 /*
  * HAVEDUP2	Define this if your system supports dup2().
@@ -132,11 +132,19 @@
 #define BSD_STYLE_COLORLS
 #endif
 
+#if defined(__NetBSD__)
+#include <sys/param.h>
+#if __NetBSD_Version__  >= 106030000       /* NetBSD 1.6C */
+#define HAVEUTMPX
+#endif
+#endif
+
 #if defined(__bsdi__)
 /*
  * _PATH_TCSHELL      if you've change the installation location (vix)
  */
-# if _BSDI_VERSION >= 199701
+#include <sys/param.h>
+# ifdef _BSDI_VERSION >= 199701
 #  define _PATH_TCSHELL "/bin/tcsh"
 /* #  undef SYSMALLOC */
 #  define SYSMALLOC
@@ -144,8 +152,8 @@
 #  define _PATH_TCSHELL "/usr/contrib/bin/tcsh"
 # endif
 
-# undef NLS
-# undef NLS_CATALOGS
+/* # undef NLS */
+/* # undef NLS_CATALOGS */
 
 #elif defined(__APPLE__)
 # define SYSMALLOC
@@ -154,8 +162,5 @@
 # define NLS_CATALOGS
 #endif
 
-#define KANJI
-#define DSPMBYTE
-
 #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 9e91642..e82478e 100644
--- a/bin/csh/config_p.h
+++ b/bin/csh/config_p.h
@@ -1,4 +1,4 @@
-/* config.h.  Generated automatically by configure.  */
+/* config.h.  Generated by configure.  */
 /*
  * config.h -- configure various defines for tcsh
  *
@@ -29,14 +29,14 @@
 /* #undef POSIXSIGS */
 
 /*
- * VFORK	This machine has a vfork().  
+ * VFORK	This machine has a vfork().
  *		It used to be that for job control to work, this define
  *		was mandatory. This is not the case any more.
- *		If you think you still need it, but you don't have vfork, 
- *		define this anyway and then do #define vfork fork.  
+ *		If you think you still need it, but you don't have vfork,
+ *		define this anyway and then do #define vfork fork.
  *		I do this anyway on a Sun because of yellow pages brain damage,
  *		[should not be needed under 4.1]
- *		and on the iris4d cause	SGI's fork is sufficiently "virtual" 
+ *		and on the iris4d cause	SGI's fork is sufficiently "virtual"
  *		that vfork isn't necessary.  (Besides, SGI's vfork is weird).
  *		Note that some machines eg. rs6000 have a vfork, but not
  *		with the berkeley semantics, so we cannot use it there either.
@@ -101,7 +101,7 @@
  * SIGVOID	Define this if your signal handlers return void.  On older
  *		systems, signal returns int, but on newer ones, it returns void.
  */
-#define SIGVOID 
+#define SIGVOID
 
 /*
  * HAVEDUP2	Define this if your system supports dup2().
@@ -132,11 +132,19 @@
 #define BSD_STYLE_COLORLS
 #endif
 
+#if defined(__NetBSD__)
+#include <sys/param.h>
+#if __NetBSD_Version__  >= 106030000       /* NetBSD 1.6C */
+#define HAVEUTMPX
+#endif
+#endif
+
 #if defined(__bsdi__)
 /*
  * _PATH_TCSHELL      if you've change the installation location (vix)
  */
-# if _BSDI_VERSION >= 199701
+#include <sys/param.h>
+# ifdef _BSDI_VERSION >= 199701
 #  define _PATH_TCSHELL "/bin/tcsh"
 /* #  undef SYSMALLOC */
 #  define SYSMALLOC
@@ -144,8 +152,8 @@
 #  define _PATH_TCSHELL "/usr/contrib/bin/tcsh"
 # endif
 
-# undef NLS
-# undef NLS_CATALOGS
+/* # undef NLS */
+/* # undef NLS_CATALOGS */
 
 #elif defined(__APPLE__)
 # define SYSMALLOC
@@ -154,8 +162,5 @@
 # define NLS_CATALOGS
 #endif
 
-#define KANJI
-#define DSPMBYTE
-
 #endif /* _h_config */
 /* config.h.in.  Generated automatically from configure.in by autoheader.  */