--- rxvt-unicode/configure.ac	2007/07/27 10:06:43	1.66
+++ rxvt-unicode/configure.ac	2007/08/01 18:38:15	1.69
@@ -243,11 +243,11 @@
     afterimage_config=$withval/afterimage-config
   fi])
 
-AC_ARG_ENABLE(afterstep,
-  [  --enable-afterstep enable integration with AfterStep window manager],
-  [if test x$enableval = xyes -o x$enableval = xno; then
-    support_afterstep=$enableval
-  fi])
+dnl AC_ARG_ENABLE(afterstep,
+dnl   [  --enable-afterstep enable integration with AfterStep window manager],
+dnl   [if test x$enableval = xyes -o x$enableval = xno; then
+dnl     support_afterstep=$enableval
+dnl   fi])
 
 AC_ARG_ENABLE(transparency,
   [  --enable-transparency   enable transparent backgrounds],
@@ -469,24 +469,28 @@
   if test "x$afterimage_config" = "x" ; then
     AC_PATH_PROG(afterimage_config, afterimage-config, no)
   fi
-  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
+  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 .`
+        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
-  fi
-
-  if test "x$support_afterimage" = "xyes"; then
-    AC_MSG_RESULT($AFTERIMAGE_LIBS)
-  else
-    AC_MSG_RESULT(no)
+    if test "x$support_afterimage" = "xyes"; then
+      AC_MSG_RESULT($AFTERIMAGE_LIBS)
+    else
+      AC_MSG_RESULT(no)
+    fi
   fi
 fi
 
@@ -806,9 +810,9 @@
   AC_DEFINE(HAVE_AFTERIMAGE, 1, Define if you want to use libAfterImage for image processing)
 fi
 
-if test x$support_afterstep = xyes; then
-  AC_DEFINE(AFTERSTEP_INTEGRATION, 1, Define if you want to integrate with AfterStep window manager)
-fi
+dnl if test x$support_afterstep = xyes; then
+dnl   AC_DEFINE(AFTERSTEP_INTEGRATION, 1, Define if you want to integrate with AfterStep window manager)
+dnl fi
 
 if test x$support_scroll_rxvt = xyes; then
   AC_DEFINE(RXVT_SCROLLBAR, 1, Support Rxvt original style scrollbars)
@@ -969,9 +973,9 @@
   echo "  AfterImage support:         yes"
 fi
 
-if test x$support_afterstep = xyes; then
-  echo "  AfterStep integration:      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"
@@ -986,6 +990,7 @@
 fi
 echo
 echo "  embedded perl:              $support_perl"
+echo "  libafterimage:              $support_afterimage"
 echo
 if test x$support_xpm = xneedsmanualspecification; then
   echo ".----------------------------------------------------------------."