--- rxvt-unicode/configure.ac	2007/06/09 10:28:55	1.40
+++ rxvt-unicode/configure.ac	2007/06/13 11:19:41	1.49
@@ -239,7 +239,11 @@
     support_afterimage=$enableval
   fi])
 
-AC_ARG_WITH(afterimage_config,  [  --with-afterimage-config=DIR  use libAfterImage config script in DIR], afterimage_config="$withval",afterimage_config=NO)
+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(afterstep,
   [  --enable-afterstep enable integration with AfterStep window manager],
@@ -467,33 +471,27 @@
 AFTERIMAGE_LIBS=
 have_afterimage=
 
-if test x$support_afterimage == xyes; then
-	AC_MSG_CHECKING(installed libAfterImage)
-	support_afterimage=no
-	if test "$afterimage_config" = "NO" ; then
-		if afterimage-config --version > /dev/null 2>&1 ; then
-			afterimage_config=afterimage-config
-		else
-			if test -x /usr/local/bin/afterimage-config; then
-				afterimage_config=/usr/local/bin/afterimage-config
-			fi
-		fi
-	else
-	    afterimage_config=$afterimage_config/afterimage-config
-	fi
-	if $afterimage_config --version > /dev/null 2>&1 ; then
-		LIBAFTERIMAGE_CFLAGS=`$afterimage_config --cflags`
-		AFTERIMAGE_LIBS=`$afterimage_config --libs`
-		if test "x$AFTERIMAGE_LIBS" != "x"; then
-			support_afterimage=yes
-		fi
-	fi
-
-	if test "x$support_afterimage" = "xyes"; then
-		AC_MSG_RESULT($AFTERIMAGE_LIBS)
-	else
-		AC_MSG_RESULT(afterimage-config not found in $afterimage_config - can't use libAfterImage for images.)
-	fi
+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
+
+  AC_MSG_CHECKING(for libAfterImage)
+  if $afterimage_config --version >/dev/null 2>&1 ; then
+    LIBAFTERIMAGE_CFLAGS=`$afterimage_config --cflags`
+    AFTERIMAGE_LIBS=`$afterimage_config --libs`
+    if test "x$AFTERIMAGE_LIBS" != "x"; then
+      support_afterimage=yes
+    fi
+  fi
+
+  if test "x$support_afterimage" = "xyes"; then
+    AC_MSG_RESULT($AFTERIMAGE_LIBS)
+  else
+    AC_MSG_RESULT(no)
+  fi
 fi
 
 if test x$support_afterimage != xyes -a x$support_xpm = xyes ; then
@@ -961,8 +959,6 @@
    support_frills=yes
 fi
 
-AC_SUBST(DEBUG)
-AC_SUBST(DINCLUDE)
 AC_SUBST(CFLAGS)
 AC_SUBST(CPPFLAGS)
 AC_SUBST(LDFLAGS)
@@ -970,13 +966,11 @@
 
 dnl# Attack the libs
 if test x$rxvt_cv_rpath = xyes -o x$rxvt_cv_R = xyes; then
-  DLIB=`echo $DLIB | sed "$R_TRANSLATE"`
   LIBS=`echo $LIBS | sed "$R_TRANSLATE"`
   X_LIBS=`echo $X_LIBS | sed "$R_TRANSLATE"`
   X_EXTRA_LIBS=`echo $X_EXTRA_LIBS | sed "$R_TRANSLATE"`
   XPM_LIBS=`echo $XPM_LIBS | sed "$R_TRANSLATE"`
 fi
-AC_SUBST(DLIB)
 AC_SUBST(LIBS)
 AC_SUBST(X_LIBS)
 AC_SUBST(X_EXTRA_LIBS)
@@ -1032,11 +1026,11 @@
 fi
 
 if test x$support_afterimage = xyes; then
-  echo "  AfterImage library:                $AFTERIMAGE_LIBS"
+  echo "  AfterImage support:         yes"
 fi
 
 if test x$support_afterstep = xyes; then
-  echo "  With AfterStep integration"
+  echo "  AfterStep integration:      yes"
 fi
 
 if test x$term != x; then