diff -c -r -P ./orig/tcl8.4a2/unix/Makefile.in ./xim/tcl8.4a2/unix/Makefile.in
*** ./orig/tcl8.4a2/unix/Makefile.in	Sat Nov  4 09:05:45 2000
--- ./xim/tcl8.4a2/unix/Makefile.in	Tue Nov 14 18:04:46 2000
***************
*** 82,87 ****
--- 82,90 ----
  CFLAGS_DEBUG		= @CFLAGS_DEBUG@
  CFLAGS_OPTIMIZE		= @CFLAGS_OPTIMIZE@
  
+ # I18n improvement flags
+ I18N_FLAGS		= @I18N_FLAGS@
+ 
  # To change the compiler switches, for example to change from optimization to
  # debugging symbols, change the following line:
  #CFLAGS			= $(CFLAGS_DEBUG)
***************
*** 212,218 ****
  
  COMPAT_OBJS		= @LIBOBJS@
  
! AC_FLAGS		= @EXTRA_CFLAGS@ @DEFS@
  RANLIB			= @RANLIB@
  SRC_DIR			= @srcdir@
  TOP_DIR			= @srcdir@/..
--- 215,221 ----
  
  COMPAT_OBJS		= @LIBOBJS@
  
! AC_FLAGS		= @EXTRA_CFLAGS@ @DEFS@ @CPPFLAGS@ @I18N_FLAGS@
  RANLIB			= @RANLIB@
  SRC_DIR			= @srcdir@
  TOP_DIR			= @srcdir@/..
diff -c -r -P ./orig/tcl8.4a2/unix/configure.in ./xim/tcl8.4a2/unix/configure.in
*** ./orig/tcl8.4a2/unix/configure.in	Sat Nov  4 09:05:45 2000
--- ./xim/tcl8.4a2/unix/configure.in	Tue Nov 14 18:07:30 2000
***************
*** 116,121 ****
--- 116,127 ----
      AC_DEFINE(NO_FD_SET)
  fi
  
+ #------------------------------------------------------------------------
+ # i18n improvement
+ #------------------------------------------------------------------------
+ 
+ SC_ENABLE_I18N_IMPROVE
+ 
  #------------------------------------------------------------------------------
  #       Find out all about time handling differences.
  #------------------------------------------------------------------------------
diff -c -r -P ./orig/tcl8.4a2/unix/tcl.m4 ./xim/tcl8.4a2/unix/tcl.m4
*** ./orig/tcl8.4a2/unix/tcl.m4	Sat Nov  4 09:05:45 2000
--- ./xim/tcl8.4a2/unix/tcl.m4	Tue Nov 14 18:09:27 2000
***************
*** 1731,1733 ****
--- 1731,1774 ----
      AC_SUBST(TCL_LIBS)
      AC_SUBST(MATH_LIBS)
  ])
+ 
+ #------------------------------------------------------------------------
+ # SC_ENABLE_I18N_IMPROVE
+ #
+ #	Decide use i18n improved features or not.
+ #
+ # Arguments:
+ #	none
+ #
+ # Results:
+ #
+ #	Adds the following arguments to configure:
+ #		--enable-i18nImprove=yes|no
+ #
+ #	Defines the following vars:
+ #		I18N_FLAGS	value of '-DI18N_IMPROVE' or ''
+ #------------------------------------------------------------------------
+ 
+ AC_DEFUN(SC_ENABLE_I18N_IMPROVE, [
+     AC_MSG_CHECKING([if i18n improvement features are enabled])
+     AC_ARG_ENABLE(i18nImprove,
+     [  --enable-i18nImprove    enable i18n improvement features [--enable-i18nImprove]],
+     [tcl_ok=$enableval], [tcl_ok=yes])
+ 
+     if test "${enable_i18nImprove+set}" = set; then
+ 	enableval="$enable_i18nImprove"
+ 	tcl_ok=$enableval
+     else
+ 	tcl_ok=yes
+     fi
+ 
+     if test "$tcl_ok" = "yes" ; then
+ 	AC_MSG_RESULT([enabled])
+ 	I18N_FLAGS='-DI18N_IMPROVE'
+     else
+ 	AC_MSG_RESULT([disabled])
+ 	I18N_FLAGS=''
+     fi
+ 
+     AC_SUBST(I18N_FLAGS)
+ ])
diff -c -r -P ./orig/tcl8.4a2/unix/tclConfig.sh.in ./xim/tcl8.4a2/unix/tclConfig.sh.in
*** ./orig/tcl8.4a2/unix/tclConfig.sh.in	Sat Nov  4 09:05:46 2000
--- ./xim/tcl8.4a2/unix/tclConfig.sh.in	Tue Nov 14 18:11:19 2000
***************
*** 21,27 ****
  TCL_CC='@CC@'
  
  # -D flags for use with the C compiler.
! TCL_DEFS='@DEFS@'
  
  # If TCL was built with debugging symbols, generated libraries contain
  # this string at the end of the library name (before the extension).
--- 21,27 ----
  TCL_CC='@CC@'
  
  # -D flags for use with the C compiler.
! TCL_DEFS='@DEFS@ @I18N_FLAGS@'
  
  # If TCL was built with debugging symbols, generated libraries contain
  # this string at the end of the library name (before the extension).
***************
*** 30,35 ****
--- 30,38 ----
  # Default flags used in an optimized and debuggable build, respectively.
  TCL_CFLAGS_DEBUG='@CFLAGS_DEBUG@'
  TCL_CFLAGS_OPTIMIZE='@CFLAGS_OPTIMIZE@'
+ 
+ # I18n improvement flags
+ TCL_I18N_IMPROVE_FLAGS='@I18N_FLAGS@'
  
  # Default linker flags used in an optimized and debuggable build, respectively.
  TCL_LDFLAGS_DEBUG='@LDFLAGS_DEBUG@'
