XEmacs 21.4.12 "Portable Code".

[chise/xemacs-chise.git] / configure.in

diff --git a/configure.in b/configure.in
index 8c1d0df..7dbf2d9 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -492,9 +492,6 @@ while test $# != 0; do
        with_xfs        | \
        with_i18n3      | \
        with_mule       | \
-       with_utf_2000   | \
-       with_chise      | \
-       with_text_coding| \
        with_file_coding| \
        with_canna      | \
        with_wnn        | \
@@ -2939,7 +2936,7 @@ if test "$with_msw" != "no"; then
     fi
 
     install_pp="$blddir/lib-src/installexe.sh"
-    XE_APPEND(-lshell32 -lgdi32 -luser32 -lcomdlg32 -lcomctl32 -lwinspool, libs_system)
+    XE_APPEND(-lshell32 -lgdi32 -luser32 -lcomdlg32 -lcomctl32 -lkernel32 -lwinspool, libs_system)
     test "$with_dragndrop" != no && XE_APPEND(msw, dragndrop_proto)
     if test "$window_system" != x11; then
        window_system=msw
@@ -3694,58 +3691,16 @@ if test "$with_file_coding" = "yes" && test "$with_mule" = "no"; then
   XE_ADD_OBJS(file-coding.o)
 fi
 
-test -z "$with_chise" && with_chise=yes
-if test "$with_chise" = "yes"; then
-    with_mule=yes
-    with_utf_2000=yes
-    with_text_coding=yes
-fi
-
 if test "$with_mule" = "yes" ; then
   AC_CHECKING(for Mule-related features)
   AC_DEFINE(MULE)
-
-  dnl Autodetect chise
-  chise_includes_found=no
-  if test "$with_chise" != "no"; then
-    AC_CHECK_HEADER(chise.h, ,with_chise=no)
-  fi
-  if test "$chise_includes_found" = "no" -a "$with_chise" != "no" -a \
-      -d "/usr/local/chise/include"; then
-    save_c_switch_site="$c_switch_site"
-    c_switch_site="$c_switch_site -I/usr/local/chise/include"
-    AC_CHECK_HEADER(chise.h,chise_includes_found=yes)
-    if test "$chise_includes_found" != "yes"; then
-      c_switch_site="$save_c_switch_site"
-      with_chise="no"
-    fi
-  fi
-
-  test -z "$with_chise" && with_chise=yes
-  if test "$with_chise" = "yes"; then
-    AC_DEFINE(CHISE)
-    XE_PREPEND(-lchise, libs_x)
-  fi
-
   AC_DEFINE(FILE_CODING)
-  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
+  XE_ADD_OBJS(mule.o mule-ccl.o mule-charset.o file-coding.o)
+
   dnl Use -lintl to get internationalized strerror for Mule
   AC_CHECK_HEADERS(libintl.h)
   AC_CHECK_LIB(intl, strerror)
 
-  if test "$with_utf_2000" = "yes" ; then
-    AC_DEFINE(CHAR_IS_UCS4)
-    AC_DEFINE(UTF2000)
-    with_wnn=no
-    with_wnn6=no
-  fi
-
   AC_CHECKING(for Mule input methods)
   dnl Do we have the XmIm* routines?  And if so, do we want to use them?
   dnl XIM seems to be flaky except on Solaris...
@@ -4470,9 +4425,6 @@ if test "$with_database_gdbm $with_database_dbm $with_database_berkdb" \
      != "no no no"; then
   AC_DEFINE(HAVE_DATABASE)
   XE_ADD_OBJS(database.o)
-  if test "$with_utf_2000" = "yes"; then
-    AC_DEFINE(HAVE_CHISE_CLIENT)
-  fi
 fi
 
 dnl Socks support
@@ -5094,11 +5046,8 @@ if test "$with_postgresql" = yes; then
 fi
 
 echo "
-Multiscriptization / Multilingualization / Internationalization:"
+Internationalization:"
 test "$with_mule" = yes && echo "  Compiling in support for Mule (multi-lingual Emacs)."
-test "$with_chise" = yes && echo "  Using CHISE (CHaracter Information Service Environment) support."
-test "$with_utf_2000" = yes && echo "  Using UTF-2000 (UTF-8) buffer/string representation."
-test "$with_text_coding" = yes && echo "  Compiling in support for text coding."
 test "$with_file_coding" = yes && echo "  Compiling in support for file coding."
 test "$with_xim" != no && echo "  Compiling in support for XIM (X11R5+ I18N input method)."
 test "$with_xim" = motif && echo "    - Using Motif to provide XIM support."