--- rxvt-unicode/configure.ac	2011/11/13 16:03:31	1.130
+++ rxvt-unicode/configure.ac	2011/12/14 13:34:20	1.133
@@ -97,7 +97,6 @@
 support_xim=yes
 support_pixbuf=yes
 support_startup_notification=yes
-support_afterimage=yes
 support_xft=yes
 support_unicode3=no
 support_combining=yes
@@ -134,7 +133,6 @@
        support_xim=no
        support_pixbuf=no
        support_startup_notification=no
-       support_afterimage=no
        support_xft=no
        support_unicode3=no
        support_combining=no
@@ -163,7 +161,6 @@
        support_xim=yes
        support_pixbuf=yes
        support_startup_notification=yes
-       support_afterimage=yes
        support_xft=yes
        support_unicode3=yes
        support_combining=yes
@@ -175,24 +172,24 @@
     fi
   ])
 
-ASSERTIONS=no
+support_assertions=no
 AC_ARG_ENABLE(assert,
   [  --enable-assert         enable assertions],
   [if test x$enableval = xyes; then
-    ASSERTIONS=yes
+    support_assertions=yes
   fi])
-if test x$ASSERTIONS = xno; then
+if test x$support_assertions = xno; then
   AC_DEFINE(NDEBUG, 1, Disable assertions (good for debugging))
 fi
 
-WARNINGS=no
+support_warnings=no
 AC_ARG_ENABLE(warnings,
   [  --enable-warnings       turn on g++ warnings],
   [if test x$enableval = xyes; then
-    WARNINGS=yes
+    support_warnings=yes
   fi])
 if test x$GXX = xyes; then
-  if test $WARNINGS = yes; then
+  if test $support_warnings = yes; then
     save_CXXFLAGS="$CXXFLAGS"
     CXXFLAGS="$CXXFLAGS -Wall -Wno-sign-compare -Wno-reorder -Wno-non-virtual-dtor"
     AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])], [], [CXXFLAGS="$save_CXXFLAGS"])
@@ -236,7 +233,7 @@
   fi])
 
 AC_ARG_ENABLE(afterimage,
-  [  --enable-afterimage     enable integration with libAfterImage for background images],
+  [  --enable-afterimage     enable integration with libAfterImage for background images (deprecated)],
   [if test x$enableval = xyes -o x$enableval = xno; then
     support_afterimage=$enableval
   fi])
@@ -500,7 +497,6 @@
 
 AFTERIMAGE_CFLAGS=
 AFTERIMAGE_LIBS=
-AFTERIMAGE_VERSION=
 
 if test x$support_afterimage = xyes; then
   support_afterimage=no
@@ -510,18 +506,15 @@
   fi
   if test "x$afterimage_config" != "xno" ; then
     AC_MSG_CHECKING(for libAfterImage version >= 1.15)
-    xAFTERIMAGE_VERSION=`$afterimage_config --version`
-    if test -n "$xAFTERIMAGE_VERSION" ; then
-      xAFTERIMAGE_CFLAGS=`$afterimage_config --cflags`
-      xAFTERIMAGE_LIBS=`$afterimage_config --libs`
-      if test "x$xAFTERIMAGE_LIBS" != "x"; then
-        libai_ver_major=`echo $xAFTERIMAGE_VERSION | cut -f 1 -d .`
-        libai_ver_minor=`echo $xAFTERIMAGE_VERSION | cut -f 2 -d .`
+    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
-          AFTERIMAGE_CFLAGS="$xAFTERIMAGE_CFLAGS"
-          AFTERIMAGE_LIBS="$xAFTERIMAGE_LIBS"
-          AFTERIMAGE_VERSION="$xAFTERIMAGE_VERSION"
         fi
       fi
     fi
@@ -532,6 +525,8 @@
       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