--- rxvt-unicode/configure.ac	2012/01/19 18:17:32	1.140
+++ rxvt-unicode/configure.ac	2012/06/19 18:17:56	1.144
@@ -97,6 +97,7 @@
 support_iso14755=yes
 support_styles=yes
 support_perl=yes
+support_xdbe=yes
 codesets=all
 
 dnl# --------------------------------------------------------------------------
@@ -109,6 +110,7 @@
   [
     if test x$enableval = xno; then
        support_frills=no
+       support_xdbe=no
        support_inheritpixmap=no
        support_fading=no
        support_keepscrolling=no
@@ -133,6 +135,7 @@
        support_iso14755=no
        support_styles=no
        support_perl=no
+       support_xdbe=no
        codesets=
     fi
     if test x$enableval = xyes; then
@@ -161,6 +164,7 @@
        support_iso14755=yes
        support_styles=yes
        support_perl=yes
+       support_xdbe=yes
        codesets=all
     fi
   ])
@@ -225,18 +229,6 @@
     support_styles=$enableval
   fi])
 
-AC_ARG_ENABLE(afterimage,
-  [  --enable-afterimage     enable integration with libAfterImage for background images (deprecated)],
-  [if test x$enableval = xyes -o x$enableval = xno; then
-    support_afterimage=$enableval
-  fi])
-
-AC_ARG_WITH(afterimage_config,
-  [  --with-afterimage-config=DIR  use libAfterImage config script in DIR],
-  [if test "x$withval" != x; then
-    afterimage_config=$withval/afterimage-config
-  fi])
-
 AC_ARG_ENABLE(pixbuf,
   [  --enable-pixbuf         enable integration with gdk-pixbuf for background images],
   [if test x$enableval = xyes -o x$enableval = xno; then
@@ -424,6 +416,12 @@
     AC_DEFINE_UNQUOTED(RXVT_TERMINFO, "$withval", Set TERMINFO value to the value given by configure) terminfo="$withval"
   fi])
 
+AC_ARG_ENABLE(xdbe,
+              [  --enable-xdbe           enable support for double buffering],
+  [if test x$enableval = xyes -o x$enableval = xno; then
+    support_xdbe=$enableval
+  fi])
+
 dnl# --------------------------------------------------------------------------
 
 LIBEV_M4_AVOID_LIBRT=1
@@ -435,35 +433,6 @@
 
 AC_PATH_XTRA
 
-image_lib=none
-
-PIXBUF_CFLAGS=
-PIXBUF_LIBS=
-
-if test x$support_pixbuf = xyes; then
-  support_pixbuf=no
-  AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-  AC_MSG_CHECKING(for gdk-pixbuf)
-  if test $PKG_CONFIG != no && $PKG_CONFIG --exists gdk-pixbuf-2.0; then
-    PIXBUF_CFLAGS="`$PKG_CONFIG gdk-pixbuf-2.0 --cflags`"
-    PIXBUF_LIBS="`$PKG_CONFIG gdk-pixbuf-2.0 --libs`"
-    support_pixbuf=yes
-  fi
-
-  if test x$support_pixbuf = xyes; then
-    AC_MSG_RESULT(ok)
-    image_lib=gdk-pixbuf
-    support_afterimage=no
-    AC_DEFINE(HAVE_PIXBUF, 1, Define if you want to use gdk-pixbuf for image processing)
-    AC_DEFINE(BG_IMAGE_FROM_FILE, 1, Define if you want to have sexy-looking background pixmaps.)
-  else
-    AC_MSG_RESULT(no)
-  fi
-fi
-
-AC_SUBST(PIXBUF_CFLAGS)
-AC_SUBST(PIXBUF_LIBS)
-
 STARTUP_NOTIFICATION_CFLAGS=
 STARTUP_NOTIFICATION_LIBS=
 
@@ -488,45 +457,6 @@
 AC_SUBST(STARTUP_NOTIFICATION_CFLAGS)
 AC_SUBST(STARTUP_NOTIFICATION_LIBS)
 
-AFTERIMAGE_CFLAGS=
-AFTERIMAGE_LIBS=
-
-if test x$support_afterimage = xyes; then
-  support_afterimage=no
-
-  if test "x$afterimage_config" = "x" ; then
-    AC_PATH_PROG(afterimage_config, afterimage-config, no)
-  fi
-  if test "x$afterimage_config" != "xno" ; then
-    AC_MSG_CHECKING(for libAfterImage version >= 1.15)
-    AFTERIMAGE_VERSION=`$afterimage_config --version`
-    if test -n "$AFTERIMAGE_VERSION" ; then
-      AFTERIMAGE_CFLAGS=`$afterimage_config --cflags`
-      AFTERIMAGE_LIBS=`$afterimage_config --libs`
-      if test "x$AFTERIMAGE_LIBS" != "x"; then
-        libai_ver_major=`echo $AFTERIMAGE_VERSION | cut -f 1 -d .`
-        libai_ver_minor=`echo $AFTERIMAGE_VERSION | cut -f 2 -d .`
-        if test $libai_ver_major -gt 1 -o \( $libai_ver_major -eq 1 -a $libai_ver_minor -ge 15 \); then
-          support_afterimage=yes
-        fi
-      fi
-    fi
-    if test "x$support_afterimage" = "xyes"; then
-      AC_MSG_RESULT($AFTERIMAGE_LIBS)
-      image_lib=libafterimage
-      AC_DEFINE(HAVE_AFTERIMAGE, 1, Define if you want to use libAfterImage for image processing)
-      AC_DEFINE(BG_IMAGE_FROM_FILE, 1, Define if you want to have sexy-looking background pixmaps.)
-    else
-      AC_MSG_RESULT(no)
-      AFTERIMAGE_CFLAGS=
-      AFTERIMAGE_LIBS=
-    fi
-  fi
-fi
-
-AC_SUBST(AFTERIMAGE_CFLAGS)
-AC_SUBST(AFTERIMAGE_LIBS)
-
 dnl# --------------------------------------------------------------------------
 dnl# CHECKING FOR HEADER FILES
 dnl# --------------------------------------------------------------------------
@@ -640,7 +570,15 @@
 dnl# --------------------------------------------------------------------------
 dnl# now add and remove other stuff
 dnl# --------------------------------------------------------------------------
-if test x$support_xft = xyes || test x$support_inheritpixmap = xyes; then
+support_image=no
+if test x$support_inheritpixmap = xyes || test x$support_pixbuf = xyes; then
+  support_image=yes
+fi
+if test x$support_xdbe = xyes; then
+  LIBS="$LIBS -lXext"
+fi
+
+if test x$support_xft = xyes || test x$support_image = xyes; then
   rxvt_have_xrender=no
   AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
   if test $PKG_CONFIG != no && $PKG_CONFIG --exists xrender; then
@@ -686,6 +624,47 @@
     AC_DEFINE(XFT, 1, Define to enable xft support)
   fi
 fi
+
+image_lib=none
+
+PIXBUF_CFLAGS=
+PIXBUF_LIBS=
+
+if test x$support_image = xyes && test x$rxvt_have_xrender = xyes; then
+  LIBS="$LIBS -lm"
+  AC_DEFINE(XRENDER, 1, Define to enable xrender support)
+
+  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
+
+  if test x$support_pixbuf = xyes; then
+    support_pixbuf=no
+    AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+    AC_MSG_CHECKING(for gdk-pixbuf)
+    if test $PKG_CONFIG != no && $PKG_CONFIG --exists gdk-pixbuf-2.0; then
+      PIXBUF_CFLAGS="`$PKG_CONFIG gdk-pixbuf-2.0 --cflags`"
+      PIXBUF_LIBS="`$PKG_CONFIG gdk-pixbuf-2.0 --libs`"
+      support_pixbuf=yes
+    fi
+
+    if test x$support_pixbuf = xyes; then
+      AC_MSG_RESULT(ok)
+      image_lib=gdk-pixbuf
+      AC_DEFINE(HAVE_PIXBUF, 1, Define if you want to use gdk-pixbuf for image processing)
+      AC_DEFINE(BG_IMAGE_FROM_FILE, 1, Define if you want to have sexy-looking background pixmaps.)
+    else
+      AC_MSG_RESULT(no)
+    fi
+  fi
+fi
+
+AC_SUBST(PIXBUF_CFLAGS)
+AC_SUBST(PIXBUF_LIBS)
+
+if test x$support_xdbe = xyes; then
+  AC_DEFINE(ENABLE_XDBE, 1, Define if you want to use XDBE)
+fi
 if test x$support_styles = xyes; then
   AC_DEFINE(ENABLE_STYLES, 1, Define if you want bold and italic support)
 fi
@@ -698,13 +677,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_inheritpixmap = xyes; then
-  if test x$rxvt_have_xrender = xyes; then
-    LIBS="$LIBS -lm"
-    AC_DEFINE(XRENDER, 1, Define to enable xrender support)
-  fi
-  AC_DEFINE(ENABLE_TRANSPARENCY, 1, Define if you want your background to use the parent window background)
-fi
 if test x$support_keepscrolling = xno; then
   AC_DEFINE(NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING, 1, Define for continual scrolling when you keep the scrollbar button pressed)
 fi
@@ -765,8 +737,7 @@
 
 IF_PERL=\#
 if test x$support_perl = xyes; then
-  AC_PATH_PROG(PERL, perl5)
-  AC_PATH_PROG(PERL, perl)
+  AC_PATH_PROG(PERL, perl5, perl)
 
   AC_MSG_CHECKING(for $PERL suitability)
   if $PERL -MExtUtils::Embed -e "use v5.8" >/dev/null 2>/dev/null; then