--- rxvt-unicode/autoconf/configure.in	2004/01/16 18:49:33	1.5
+++ rxvt-unicode/autoconf/configure.in	2004/02/25 12:03:47	1.14
@@ -1,7 +1,5 @@
 dnl# -*- sh -*-
 dnl#
-dnl# $Id: configure.in,v 1.5 2004/01/16 18:49:33 pcg Exp $
-dnl#
 dnl# Process this file with autoconf to produce a configure script.
 dnl#
 AC_INIT(src/feature.h)
@@ -44,7 +42,6 @@
 support_addstrings=no
 support_frills=no
 support_linespace=no
-support_graphics=no
 support_inheritpixmap=no
 support_keepscrolling=no
 support_selectionscrolling=no
@@ -56,10 +53,12 @@
 support_wtmp=no
 support_lastlog=no
 support_cursor_blink=no
+support_text_blink=no
 support_pointer_blank=no
 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
@@ -84,7 +83,6 @@
     support_24bit=yes
     support_frills=yes
     support_linespace=yes
-    support_graphics=yes
     support_inheritpixmap=yes
     support_keepscrolling=yes
     support_selectionscrolling=yes
@@ -94,10 +92,12 @@
     support_mouseslipwheel=yes
     support_oldselection=yes
     support_cursor_blink=yes
+    support_text_blink=yes
     support_pointer_blank=yes
     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
@@ -107,25 +107,6 @@
     codesets=all
   fi])
 
-echo
-if test x$support_inheritpixmap = xyes; then
-    support_inheritpixmap=no
-    echo "******* transparency support disabled, does not work"
-fi
-if test x$support_xpm = xyes; then
-    support_xpm=no
-    echo "******* pixmap support disabled, does not work"
-fi
-if test x$support_graphics = xyes; then
-    support_graphics=no
-    echo "******* graphics support disabled, does not work"
-fi
-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
@@ -153,65 +134,65 @@
   fi])
 
 AC_ARG_ENABLE(utmp,
-  [  --enable-utmp           enable utmp (utmpx) support                         *],
+  [  --enable-utmp           enable utmp (utmpx) support],
   [if test x$enableval = xyes -o x$enableval = xno; then
     support_utmp=$enableval
   fi])
 
 AC_ARG_ENABLE(wtmp,
-  [  --enable-wtmp           enable wtmp (wtmpx) support (requires --enable-utmp)*],
+  [  --enable-wtmp           enable wtmp (wtmpx) support (requires --enable-utmp)],
   [if test x$enableval = xyes -o x$enableval = xno; then
     support_wtmp=$enableval
   fi])
 
 AC_ARG_ENABLE(lastlog,
-  [  --enable-lastlog        enable lastlog support (requires --enable-utmp)     *],
+  [  --enable-lastlog        enable lastlog support (requires --enable-utmp)],
   [if test x$enableval = xyes -o x$enableval = xno; then
     support_lastlog=$enableval
   fi])
 
 AC_ARG_ENABLE(xpm-background,
-  [  --enable-xpm-background enable XPM background pixmaps                       *],
+  [  --enable-xpm-background enable XPM background pixmaps],
   [if test x$enableval = xyes -o x$enableval = xno; then
     support_xpm=$enableval
   fi])
 
 AC_ARG_ENABLE(transparency,
-  [  --enable-transparency   enable transparent backgrounds                      *],
+  [  --enable-transparency   enable transparent backgrounds],
   [if test x$enableval = xyes -o x$enableval = xno; then
     support_inheritpixmap=$enableval
   fi])
 
 AC_ARG_ENABLE(menubar,
-  [  --enable-menubar        enable menubar                                      *],
+  [  --enable-menubar        enable menubar],
   [if test x$enableval = xyes -o x$enableval = xno; then
     support_menubar=$enableval
   fi])
 
-AC_ARG_ENABLE(graphics,
-  [  --enable-graphics       enable rxvt own graphics mode (see src/graphics)    *],
-  [if test x$enableval = xyes -o x$enableval = xno; then
-    support_graphics=$enableval
-  fi])
-
 AC_ARG_ENABLE(rxvt-scroll,
-  [  --enable-rxvt-scroll    enable rxvt style scrollbar                         *],
+  [  --enable-rxvt-scroll    enable rxvt style scrollbar],
   [if test x$enableval = xyes -o x$enableval = xno; then
     support_scroll_rxvt=$enableval
   fi])
 
 AC_ARG_ENABLE(next-scroll,
-  [  --enable-next-scroll    enable NeXT style scrollbar                         *],
+  [  --enable-next-scroll    enable NeXT style scrollbar],
   [if test x$enableval = xyes -o x$enableval = xno; then
     support_scroll_next=$enableval
   fi])
 
 AC_ARG_ENABLE(xterm-scroll,
-  [  --enable-xterm-scroll   enable Xterm style scrollbar                        *],
+  [  --enable-xterm-scroll   enable Xterm style scrollbar],
   [if test x$enableval = xyes -o x$enableval = xno; then
     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
@@ -219,17 +200,11 @@
   fi])
 
 AC_ARG_ENABLE(xim,
-  [  --enable-xim            XIM (X Input Method) protocol support               *],
+  [  --enable-xim            XIM (X Input Method) protocol support],
   [if test x$enableval = xyes -o x$enableval = xno; then
     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
@@ -273,49 +248,49 @@
   fi])
 
 AC_ARG_ENABLE(frills,
-  [  --enable-frills         enable support for rarely used features             *],
+  [  --enable-frills         enable support for rarely used features],
   [if test x$enableval = xyes -o x$enableval = xno; then
     support_frills=$enableval
   fi])
 
 AC_ARG_ENABLE(linespace,
-  [  --enable-linespace      enable support for linespace                        *],
+  [  --enable-linespace      enable support for linespace],
   [if test x$enableval = xyes -o x$enableval = xno; then
     support_linespace=$enableval
   fi])
 
 AC_ARG_ENABLE(24bit,
-  [  --enable-24bit          enable support for using 24bit visuals if available *],
+  [  --enable-24bit          enable support for using 24bit visuals if available],
   [if test x$enableval = xyes -o x$enableval = xno; then
     support_24bit=$enableval
   fi])
 
 AC_ARG_ENABLE(keepscrolling,
-  [  --enable-keepscrolling  enable continual scrolling on scrollbar arrow press *],
+  [  --enable-keepscrolling  enable continual scrolling on scrollbar arrow press],
   [if test x$enableval = xyes -o x$enableval = xno; then
     support_keepscrolling=$enableval
   fi])
 
 AC_ARG_ENABLE(selectionscrolling,
-  [  --enable-selectionscrolling  enable scrolling during selections             *],
+  [  --enable-selectionscrolling  enable scrolling during selections],
   [if test x$enableval = xyes -o x$enableval = xno; then
     support_selectionscrolling=$enableval
   fi])
 
 AC_ARG_ENABLE(mousewheel,
-  [  --enable-mousewheel     enable scrolling via mouse wheel or buttons 4 & 5   *],
+  [  --enable-mousewheel     enable scrolling via mouse wheel or buttons 4 & 5],
   [if test x$enableval = xyes -o x$enableval = xno; then
     support_mousewheel=$enableval
   fi])
 
 AC_ARG_ENABLE(slipwheeling,
-  [  --enable-slipwheeling   enable slip wheel scrolling     (requires previous) *],
+  [  --enable-slipwheeling   enable slip wheel scrolling     (requires previous)],
   [if test x$enableval = xyes -o x$enableval = xno; then
     support_mouseslipwheel=$enableval
   fi])
 
 AC_ARG_ENABLE(old-selection,
-  [  --enable-old-selection  enable v2.20 (& prior) mouse selection style support*],
+  [  --enable-old-selection  enable v2.20 (& prior) mouse selection style support],
   [if test x$enableval = xyes -o x$enableval = xno; then
     support_oldselection=$enableval
   fi])
@@ -358,19 +333,25 @@
   fi])
 
 AC_ARG_ENABLE(cursor-blink,
-  [  --enable-cursor-blink   enable blinking cursor                              *],
+  [  --enable-cursor-blink   enable blinking cursor],
   [if test x$enableval = xyes -o x$enableval = xno; then
     support_cursor_blink=$enableval
   fi])
 
+AC_ARG_ENABLE(text-blink,
+  [  --enable-text-blink     enable blinking text],
+  [if test x$enableval = xyes -o x$enableval = xno; then
+    support_text_blink=$enableval
+  fi])
+
 AC_ARG_ENABLE(pointer-blank,
-  [  --enable-pointer-blank  enable pointer blank when typing or inactive pointer*],
+  [  --enable-pointer-blank  enable pointer blank when typing or inactive pointer],
   [if test x$enableval = xyes -o x$enableval = xno; then
     support_pointer_blank=$enableval
   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])
@@ -1135,9 +1116,6 @@
 dnl# --------------------------------------------------------------------------
 dnl# now add and remove other stuff
 dnl# --------------------------------------------------------------------------
-if test x$support_graphics = xyes; then
-  AC_DEFINE(RXVT_GRAPHICS, 1, Define if you want Rob Nation's own graphic mode)
-fi
 if test x$support_inheritpixmap = xyes; then
   AC_DEFINE(TRANSPARENT, 1, Define if you want your background to use the parent window background)
 fi
@@ -1197,12 +1175,19 @@
   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
 if test x$support_cursor_blink = xyes; then
   AC_DEFINE(CURSOR_BLINK, 1, Define if you want blinking cursor support)
 fi
+if test x$support_text_blink = xyes; then
+  AC_DEFINE(TEXT_BLINK, 1, Define if you want blinking text support)
+fi
 if test x$support_unicode3 = xyes; then
   AC_DEFINE(UNICODE_3, 1, Define if you want to represent unicode characters outside plane 0)
 fi
@@ -1210,7 +1195,7 @@
   codesets=jp,jp-ext,kr,cn,cn-ext,vn
 fi
 for codeset in `echo $codesets | tr "[a-z,\\-]" "[A-Z _]"`; do
-  AC_DEFINE(ENCODING_EU, 1, Define if you want europeean extended codesets)
+  AC_DEFINE(ENCODING_EU, 1, Define if you want european extended codesets)
   case "$codeset" in
     VN     ) AC_DEFINE(ENCODING_VN,     1, Define if you want vietnamese codesets) ;;
     JP     ) AC_DEFINE(ENCODING_JP,     1, Define if you want japanese codesets) ;;
@@ -1302,7 +1287,6 @@
 Makefile \
 doc/Makefile \
 src/Makefile \
-src/graphics/Makefile \
 src/test/Makefile \
 src/rxvtlib.h \
 W11/Makefile \