From: tomo <tomo>
Date: Wed, 12 Mar 2003 12:51:39 +0000 (+0000)
Subject: - Add new option `--with-chise'.
X-Git-Tag: r21-4-11-chise-0_21-pre1^2~10
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e2d4b505035ad4d48457b878b714c9fe0c81159d;p=chise%2Fxemacs-chise.git.1

- Add new option `--with-chise'.
- define `CHISE' if --with-chise is specified and/or chise.h is found.
- Disable Wnn support if UTF2000 is enables.
- Display "Multiscriptization / Multilingualization /
  Internationalization:" instead of "Internationalization:".
---

diff --git a/configure.in b/configure.in
index c8950e7..8c1d0df 100644
--- a/configure.in
+++ b/configure.in
@@ -493,6 +493,7 @@ while test $# != 0; do
 	with_i18n3	| \
 	with_mule	| \
 	with_utf_2000	| \
+	with_chise	| \
 	with_text_coding| \
 	with_file_coding| \
 	with_canna	| \
@@ -3693,9 +3694,39 @@ 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
@@ -3711,6 +3742,8 @@ if test "$with_mule" = "yes" ; then
   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)
@@ -5061,8 +5094,9 @@ if test "$with_postgresql" = yes; then
 fi
 
 echo "
-Internationalization:"
+Multiscriptization / Multilingualization / 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."