--- rxvt-unicode/configure.ac	2008/01/06 21:34:57	1.104
+++ rxvt-unicode/configure.ac	2010/04/01 08:10:21	1.110
@@ -34,7 +34,7 @@
 AC_ISC_POSIX
 AC_LANG(C++)
 
-dnl check wether we can link with gcc -lsupc++
+dnl check whether we can link with gcc -lsupc++
 if test x$GCC = xyes && test x$GXX = xyes; then
    dnl FreeBSD (at least up to 5.3) has a broken GCC, workaround it
    AC_MSG_CHECKING([for working libsupc++])
@@ -94,7 +94,6 @@
 support_scroll_rxvt=yes
 support_scroll_next=yes
 support_scroll_xterm=yes
-support_scroll_plain=yes
 support_xim=yes
 support_afterimage=yes
 support_afterstep=yes
@@ -129,7 +128,6 @@
        support_scroll_rxvt=no
        support_scroll_next=no
        support_scroll_xterm=no
-       support_scroll_plain=no
        support_utmp=no
        support_wtmp=no
        support_xim=no
@@ -158,7 +156,6 @@
        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
@@ -175,6 +172,16 @@
     fi
   ])
 
+ASSERTIONS=no
+AC_ARG_ENABLE(assert,
+  [  --enable-assert         enable assertions],
+  [if test x$enableval = xyes; then
+    ASSERTIONS=yes
+  fi])
+if test x$ASSERTIONS = xno; then
+  AC_DEFINE(NDEBUG, 1, Disable assertions (good for debugging))
+fi
+
 WARNINGS=no
 AC_ARG_ENABLE(warnings,
   [  --enable-warnings       turn on g++ warnings],
@@ -191,6 +198,16 @@
   fi
 fi
 
+support_256_color=no
+AC_ARG_ENABLE(256-color,
+  [  --enable-256-color      enable 256-color support],
+  [if test x$enableval = xyes; then
+    support_256_color=yes
+  fi])
+if test x$support_256_color = xyes; then
+  AC_DEFINE(USE_256_COLORS, 1, Define if you want 256-color support)
+fi
+
 AC_ARG_ENABLE(unicode3,
   [  --enable-unicode3       use 21 instead of 16 bits to represent unicode characters],
   [if test x$enableval = xyes -o x$enableval = xno; then
@@ -263,12 +280,6 @@
     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(perl,
   [  --enable-perl           enable embedded perl interpreter],
   [if test x$enableval = xyes -o x$enableval = xno; then
@@ -398,7 +409,7 @@
   fi])
 
 AC_ARG_ENABLE(pointer-blank,
-  [  --enable-pointer-blank  enable pointer blank when typing or inactive pointer],
+  [  --enable-pointer-blank  enable pointer blanking when typing or inactive],
   [if test x$enableval = xyes -o x$enableval = xno; then
     support_pointer_blank=$enableval
   fi])
@@ -480,7 +491,7 @@
   AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef)
 fi
 
-AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_xlib_illegal_access,
+AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_cv_xlib_illegal_access,
 [AC_COMPILE_IFELSE(
    [AC_LANG_PROGRAM([
 #define XLIB_ILLEGAL_ACCESS
@@ -489,9 +500,9 @@
       Display *dpy;
       dpy->xdefaults = (char *)0;
    ])],
-   [rxvt_xlib_illegal_access=yes],[rxvt_xlib_illegal_access=no]
+   [rxvt_cv_xlib_illegal_access=yes],[rxvt_cv_xlib_illegal_access=no]
 )])
-if test x$rxvt_xlib_illegal_access = xyes; then
+if test x$rxvt_cv_xlib_illegal_access = xyes; then
    AC_DEFINE(XLIB_ILLEGAL_ACCESS, 1, Define ONLY iff Xlib.h supports it)
 fi
 
@@ -538,7 +549,7 @@
     :])])
   if test x$rxvt_cv_func_xlocale = xyes; then
     AC_DEFINE(USE_XIM, 1, Define if you want to have XIM (X Input Method) protocol support - required for multibyte characters input)
-    AC_CACHE_CHECK(for broken XIM callback, rxvt_broken_ximcb,
+    AC_CACHE_CHECK(for broken XIM callback, rxvt_cv_broken_ximcb,
     [AC_COMPILE_IFELSE([
     #include <X11/Xlib.h>
 
@@ -548,9 +559,9 @@
       XIMCallback cb;
       cb.callback = im_destroy_cb;
     }
-    ],rxvt_broken_ximcb=yes,rxvt_broken_ximcb=no)])
+    ],rxvt_cv_broken_ximcb=yes,rxvt_cv_broken_ximcb=no)])
 
-    if test x$rxvt_broken_ximcb = xyes; then
+    if test x$rxvt_cv_broken_ximcb = xyes; then
        AC_DEFINE(XIMCB_PROTO_BROKEN, 1, Define if your XIMCallback specifies XIC as first type.)
     fi
   fi
@@ -648,9 +659,12 @@
 dnl   AC_DEFINE(AFTERSTEP_INTEGRATION, 1, Define if you want to integrate with AfterStep window manager)
 dnl fi
 
+scrolltypes=plain
+AC_DEFINE(PLAIN_SCROLLBAR, 1, Support plain style scrollbars)
+
 if test x$support_scroll_rxvt = xyes; then
   AC_DEFINE(RXVT_SCROLLBAR, 1, Support Rxvt original style scrollbars)
-  scrolltypes="rxvt"
+  scrolltypes="$scrolltypes rxvt"
 fi
 if test x$support_scroll_next = xyes; then
   AC_DEFINE(NEXT_SCROLLBAR, 1, Support NeXT style scrollbars)
@@ -660,10 +674,6 @@
   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