*** empty log message ***

diff --git a/autoconf/config.h.in b/autoconf/config.h.in
index e46042b30180f3edc8696268f887feab56b6cfd6..1b8b54792f1360b1ae90b58d9b494e25c2bea7a7 100644 (file)
--- a/autoconf/config.h.in
+++ b/autoconf/config.h.in
@@ -184,9 +184,6 @@
 /* Build shared library version - specify via configure only */
 #undef LIBRXVT
 
-/* Define default multichar glyph encoding */
-#undef MULTICHAR_ENCODING
-
 /* Define if you want the depth of scrollbars and menus to be less */
 #undef HALFSHADOW
 

diff --git a/autoconf/configure.in b/autoconf/configure.in
index 27c8d3b104aaf72a82a7e6a63c7e1fccabbaed50..4e41f6b7a5b86da6c2ded84e906a9d3355269c72 100644 (file)
--- a/autoconf/configure.in
+++ b/autoconf/configure.in
@@ -76,7 +76,7 @@ fi
 AC_SUBST(INSTALL_LIBRXVT)
 
 AC_ARG_ENABLE(everything,
-  [  --enable-everything     enable standard non-multichoice features: marked *
+  [  --enable-everything     enable standard non-multichoice features
                      NOTE: this option is order dependent
                      NOTE: automatically enabled with --enable-shared],
   [if test x$enableval = xyes; then
@@ -109,29 +109,19 @@ AC_ARG_ENABLE(everything,
 
 AC_ARG_ENABLE(unicode3,
   [  --enable-unicode3       use 21 instead of 16 bits to represent unicode characters],
-  [if test x$enableval = xyes; then
+  [if test x$enableval = xyes -o x$enableval = xno; then
     support_unicode3=yes
   fi])
 
 AC_ARG_ENABLE(xft,
   [  --enable-xft       enable xft support on systems that have it],
-  [if test x$enableval = xyes; then
+  [if test x$enableval = xyes -o x$enableval = xno; then
     support_xft=yes
   fi])
 
 AC_ARG_WITH(codesets,
   [  --with-codesets=NAME,...    compile in additional codesets (jp,jp_ext,kr,cn,cn_ext,vn,all)],
-  [if test x$enableval = xyes; then
-    codesets="$withval"
-  fi])
-
-AC_ARG_WITH(encoding,
-  [  --with-encoding=NAME    set language default encoding to NAME (default: sjis)
-                          (eucj|sjis|big5|gb|kr|noenc)],
-  [if test x$enableval = xyes; then
-    withval=`echo $withval | tr '[a-z]' '[A-Z]'`
-    AC_DEFINE_UNQUOTED(MULTICHAR_ENCODING, $withval, Define default multichar glyph encoding)
-  fi])
+  [codesets="$withval"])
 
 AC_ARG_ENABLE(utmp,
   [  --enable-utmp           enable utmp (utmpx) support],