--- rxvt-unicode/autoconf/configure.in	2004/01/31 02:14:58	1.10
+++ rxvt-unicode/autoconf/configure.in	2004/02/29 22:32:31	1.15
@@ -58,6 +58,7 @@
 support_scroll_rxvt=no
 support_scroll_next=no
 support_scroll_xterm=no
+support_scroll_plain=no
 support_xim=no
 support_xpm=no
 support_xft=no
@@ -75,7 +76,7 @@
 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
@@ -96,6 +97,7 @@
     support_scroll_rxvt=yes
     support_scroll_next=yes
     support_scroll_xterm=yes
+    support_scroll_plain=yes
     support_utmp=yes
     support_wtmp=yes
     support_xim=yes
@@ -105,38 +107,21 @@
     codesets=all
   fi])
 
-echo
-if test x$support_menubar = xyes; then
-    support_menubar=no
-    echo "******* menubar support disabled, does not work"
-fi
-echo
-
 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],
@@ -192,6 +177,12 @@
     support_scroll_xterm=$enableval
   fi])
 
+AC_ARG_ENABLE(plain-scroll,
+  [  --enable-plain-scroll   enable plain style scrollbar],
+  [if test x$enableval = xyes -o x$enableval = xno; then
+    support_scroll_plain=$enableval
+  fi])
+
 AC_ARG_ENABLE(half-shadow,
   [  --enable-half-shadow    use half width/height shadow on rxvt scrollbar],
   [if test x$enableval = xyes; then
@@ -204,12 +195,6 @@
     support_xim=$enableval
   fi])
 
-AC_ARG_ENABLE(greek,
-  [  --enable-greek          enable greek keyboard support],
-  [if test x$enableval = xyes; then
-    AC_DEFINE(GREEK_SUPPORT, 1, Define if you want support for Greek Elot-928 & IBM-437 keyboard)
-  fi])
-
 AC_ARG_ENABLE(ttygid,
   [  --enable-ttygid         enable tty setting to group named "tty"],
   [if test x$enableval = xyes; then
@@ -356,7 +341,7 @@
   fi])
 
 AC_ARG_WITH(term,
-  [  --with-term=NAME        set the terminal to NAME (default \"xterm\")],
+  [  --with-term=NAME        set the terminal to NAME (default \"rxvt\")],
   [if test x$withval != x; then
     AC_DEFINE_UNQUOTED(TERMENV, "$withval",Set TERM to the value given by configure) term="$withval"
   fi])
@@ -1180,6 +1165,10 @@
   AC_DEFINE(XTERM_SCROLLBAR, 1, Support Xterm style scrollbars)
   scrolltypes="$scrolltypes xterm"
 fi
+if test x$support_scroll_plain = xyes; then
+  AC_DEFINE(PLAIN_SCROLLBAR, 1, Support plain style scrollbars)
+  scrolltypes="$scrolltypes plain"
+fi
 if test x$support_pointer_blank = xyes; then
   AC_DEFINE(POINTER_BLANK, 1, Define if you want hide the pointer while typing)
 fi