--- rxvt-unicode/configure.ac	2007/06/08 20:04:10	1.39
+++ rxvt-unicode/configure.ac	2007/06/13 11:19:41	1.49
@@ -15,10 +15,10 @@
 DATE=`sed -n -e 's/^.*[ \t]DATE.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h`
 dnl LIBVERSION=`sed -n -e 's/^.*[ \t]LIBVERSION.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h`
 changequote([, ])dnl
-AC_SUBST(VERSION)dnl 
-AC_SUBST(DATE)dnl 
-AC_SUBST(LSMDATE)dnl 
-AC_SUBST(LIBVERSION)dnl 
+AC_SUBST(VERSION)dnl
+AC_SUBST(DATE)dnl
+AC_SUBST(LSMDATE)dnl
+AC_SUBST(LIBVERSION)dnl
 echo ""
 echo "configuring for rxvt $VERSION"
 echo ""
@@ -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
@@ -560,8 +558,8 @@
 {
     exit(0);
     (void) XOpenDisplay("foobar");
-}]])],[rxvt_cv_rpath=yes],[rxvt_cv_rpath=no],[dnl                  
-  AC_MSG_WARN(You may need to check the LIBS line)])])             
+}]])],[rxvt_cv_rpath=yes],[rxvt_cv_rpath=no],[dnl
+  AC_MSG_WARN(You may need to check the LIBS line)])])
 if test x$rxvt_cv_rpath != xyes; then
   changequote(, )dnl
   R_TRANSLATE='s/-L\([^ ]*\)/-L\1 '$LDARG'-R\1/g'
@@ -574,7 +572,7 @@
 {
     exit(0);
     (void) XOpenDisplay("foobar");
-}]])],[rxvt_cv_R=yes],[rxvt_cv_R=no],[rxvt_cv_R=no])])             
+}]])],[rxvt_cv_R=yes],[rxvt_cv_R=no],[rxvt_cv_R=no])])
   if test x$rxvt_cv_R != xyes; then
     LIBS="$ac_save_LIBS $X_LIBS $X_EXTRA_LIBS -lX11"
   fi
@@ -718,7 +716,7 @@
 [for ttys_file in   dnl
   /etc/ttys /etc/ttytab;
 do
-  if test -f "$ttys_file" ; then 
+  if test -f "$ttys_file" ; then
     rxvt_cv_path_ttytab=$ttys_file
     break
   fi
@@ -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