--- rxvt-unicode/configure.ac	2007/08/02 00:09:54	1.70
+++ rxvt-unicode/configure.ac	2007/09/18 12:17:58	1.76
@@ -97,7 +97,6 @@
 
 support_frills=yes
 support_inheritpixmap=yes
-support_tinting=yes
 support_fading=yes
 support_keepscrolling=yes
 support_selectionscrolling=yes
@@ -139,7 +138,6 @@
     if test x$enableval = xno; then
        support_frills=no
        support_inheritpixmap=no
-       support_tinting=no
        support_fading=no
        support_keepscrolling=no
        support_selectionscrolling=no
@@ -169,7 +167,6 @@
     if test x$enableval = xyes; then
        support_frills=yes
        support_inheritpixmap=yes
-       support_tinting=yes
        support_fading=yes
        support_keepscrolling=yes
        support_selectionscrolling=yes
@@ -246,12 +243,6 @@
     support_inheritpixmap=$enableval
   fi])
 
-AC_ARG_ENABLE(tinting,
-  [  --enable-tinting        enable tinting of transparent bg],
-  [if test x$enableval = xyes -o x$enableval = xno; then
-    support_tinting=$enableval
-  fi])
-
 AC_ARG_ENABLE(fading,
   [  --enable-fading         enable colors fading when off focus],
   [if test x$enableval = xyes -o x$enableval = xno; then
@@ -430,7 +421,7 @@
 
 dnl# --------------------------------------------------------------------------
 
-AC_PATH_PROG(TIC, tic)
+AC_PATH_PROG(TIC, tic, :)
 
 dnl# need a neat way to detect SVR4 or its features
 dnl# in src/command.c we use these functions:
@@ -670,20 +661,35 @@
 ac_save_CFLAGS=$CFLAGS
 CFLAGS="$CFLAGS $X_CFLAGS"
 LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11"
-AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale,
-[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h>
-#include <stdlib.h>
-main() {
-char *p;
-if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p)
-exit (XSupportsLocale() ? 0 : 1);
-else
-exit (1);}]])],[dnl
-  rxvt_cv_func_xlocale=yes],[rxvt_cv_func_xlocale=no],[dnl
-  :])])
 if test x$support_xim = xyes; then
+  AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale,
+  [AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h>
+  #include <stdlib.h>
+  main() {
+  char *p;
+  if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p)
+  exit (XSupportsLocale() ? 0 : 1);
+  else
+  exit (1);}]])],[dnl
+    rxvt_cv_func_xlocale=yes],[rxvt_cv_func_xlocale=no],[dnl
+    :])])
   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_COMPILE_IFELSE([
+    #include <X11/Xlib.h>
+
+    void im_destroy_cb (XIC unused1, XPointer client_data, XPointer unused3);
+
+    void f() {
+      XIMCallback cb;
+      cb.callback = im_destroy_cb;
+    }
+    ],rxvt_broken_ximcb=yes,rxvt_broken_ximcb=no)])
+
+    if test x$rxvt_broken_ximcb = xyes; then
+       AC_DEFINE(XIMCB_PROTO_BROKEN, 1, Define if your XIMCallback specifies XIC as first type.)
+    fi
   fi
 fi
 
@@ -710,22 +716,6 @@
 
 SCM_RIGHTS_CHECK
 
-AC_CACHE_CHECK(for broken XIM callback, rxvt_broken_ximcb,
-[AC_COMPILE_IFELSE([
-#include <X11/Xlib.h>
-
-void im_destroy_cb (XIC unused1, XPointer client_data, XPointer unused3);
-
-void f() {
-  XIMCallback cb;
-  cb.callback = im_destroy_cb;
-}
-],rxvt_broken_ximcb=yes,rxvt_broken_ximcb=no)])
-
-if test x$rxvt_broken_ximcb = xyes; then
-   AC_DEFINE(XIMCB_PROTO_BROKEN, 1, Define if your XIMCallback specifies XIC as first type.)
-fi
-
 PTY_CHECK
 
 TTY_GROUP_CHECK
@@ -765,9 +755,6 @@
 if test x$support_fading = xyes; then
   AC_DEFINE(OFF_FOCUS_FADING, 1, Define if you want faded colors when focus is lost)
 fi
-if test x$support_tinting = xyes; then
-  AC_DEFINE(TINTING, 1, Define if you want your background to be tinted)
-fi
 if test x$support_inheritpixmap = xyes; then
   AC_DEFINE(ENABLE_TRANSPARENCY, 1, Define if you want your background to use the parent window background)
 fi
@@ -777,6 +764,9 @@
 if test x$support_selectionscrolling = xyes; then
   AC_DEFINE(SELECTION_SCROLLING, 1, Define to allow scrolling when the selection moves to the top or bottom of the screen)
 fi
+if test x$support_frills = xyes; then
+  AC_DEFINE(ENABLE_FRILLS, 1, Define if you want handling for rarely used but handy features)
+fi
 if test x$support_mousewheel = xyes; then
   AC_DEFINE(MOUSE_WHEEL, 1, Define to use wheel events (button4 and button5) to scroll)
 fi
@@ -785,7 +775,7 @@
 fi
 if test x$support_afterimage = xyes; then
   AC_DEFINE(HAVE_AFTERIMAGE, 1, Define if you want to use libAfterImage for image processing)
-  AC_DEFINE(XPM_BACKGROUND, 1, Define if you want to have sexy-looking background pixmaps. Needs libAfterImage)
+  AC_DEFINE(BG_IMAGE_FROM_FILE, 1, Define if you want to have sexy-looking background pixmaps. Needs libAfterImage)
 fi
 
 dnl if test x$support_afterstep = xyes; then
@@ -879,14 +869,6 @@
 AC_SUBST(IF_PERL)
 AC_SUBST(PERL_O)
 
-if test x$support_perl = xyes; then
-   support_frills=yes
-fi
-
-if test x$support_frills = xyes; then
-  AC_DEFINE(ENABLE_FRILLS, 1, Define if you want handling for rarely used but handy features)
-fi
-
 AC_SUBST(CFLAGS)
 AC_SUBST(CPPFLAGS)
 AC_SUBST(LDFLAGS)
@@ -943,14 +925,6 @@
   Compiler flags:             $CXXFLAGS
   Linker:                     $LINKER"
 
-if test x$support_afterimage = xyes; then
-  echo "  AfterImage support:         yes"
-fi
-
-dnl if test x$support_afterstep = xyes; then
-dnl   echo "  AfterStep integration:      yes"
-dnl fi
-
 if test x$term != x; then
   echo "  set TERM to:                $term"
 fi
@@ -965,6 +939,7 @@
 echo
 echo "  embedded perl:              $support_perl"
 echo "  libafterimage:              $support_afterimage"
+dnl echo "  AfterStep integration:      $support_afterstep"
 echo
 if test x$support_xim = xyes -a x$rxvt_cv_func_xlocale = xno; then
   echo ".----------------------------------------------------------------."