X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=configure.in;h=02d8fb22d0aa069580c368c5afd0a831ba7ff26b;hb=fc8c49f95acdb03a30285dd95187ca8d586d4f54;hp=57f59e3e09ab6d5657306cd55d0ad80cf9919406;hpb=b623fb6516df4ba24a9a16f8199b4341eb9aff52;p=chise%2Fxemacs-chise.git

diff --git a/configure.in b/configure.in
index 57f59e3..02d8fb2 100644
--- a/configure.in
+++ b/configure.in
@@ -498,7 +498,7 @@ while test $# != 0; do
 	with_i18n3	| \
 	with_mule	| \
 	with_utf_2000	| \
-	with_ucs4	| \
+	with_text_coding| \
 	with_file_coding| \
 	with_canna	| \
 	with_wnn	| \
@@ -2988,8 +2988,13 @@ if test "$with_mule" = "yes" ; then
   AC_CHECKING(for Mule-related features)
   AC_DEFINE(MULE)
   AC_DEFINE(FILE_CODING)
-  XE_ADD_OBJS(mule.o mule-ccl.o mule-charset.o file-coding.o)
-
+  XE_ADD_OBJS(mule.o mule-ccl.o mule-charset.o)
+  if test "$with_utf_2000" = "yes" && test "$with_text_coding" = "yes"; then
+    AC_DEFINE(TEXT_CODING)
+    XE_ADD_OBJS(text-coding.o)
+  else
+    XE_ADD_OBJS(file-coding.o)
+  fi
   dnl Use -lintl to get internationalized strerror for Mule
   AC_CHECK_HEADERS(libintl.h)
   AC_CHECK_LIB(intl, strerror)
@@ -2997,8 +3002,6 @@ if test "$with_mule" = "yes" ; then
   if test "$with_utf_2000" = "yes" ; then
     AC_DEFINE(CHAR_IS_UCS4)
     AC_DEFINE(UTF2000)
-  elif test "$with_ucs4" = "yes" ; then
-    AC_DEFINE(CHAR_IS_UCS4)
   fi
 
   AC_CHECKING(for Mule input methods)
@@ -4117,6 +4120,8 @@ test "$with_ncurses"  = yes && echo "  Compiling in support for ncurses."
 test "$with_gpm"      = yes && echo "  Compiling in support for GPM (General Purpose Mouse)."
 
 test "$with_mule"     = yes && echo "  Compiling in Mule (multi-lingual) support."
+test "$with_utf_2000" = yes && echo "  Using UTF-2000 (UTF-8) buffer/string representation."
+test "$with_text_coding"     = yes && echo "  Compiling in Text coding support."
 test "$with_file_coding"     = yes && echo "  Compiling in File coding support."
 test "$with_xim"      != no && echo "  Compiling in XIM (X11R5+ I18N input method) support."
 test "$with_xim" = motif    && echo "    Using Motif to provide XIM support."