--- rxvt-unicode/configure.ac	2007/06/09 11:15:38	1.41
+++ rxvt-unicode/configure.ac	2007/06/25 13:50:40	1.53
@@ -48,7 +48,10 @@
    LINKER="$CC"
    AC_LINK_IFELSE(
       [AC_LANG_PROGRAM([struct test { }; void f() try { throw new test; } catch (...) { throw; }],[])],
-      [AC_MSG_RESULT(ok)],
+      [
+         AC_MSG_RESULT(ok)
+         CXXLIB="-lsupc++"
+      ],
       [
          AC_MSG_RESULT([no, making everything bigger and slower])
          LIBS="$save_LIBS"
@@ -58,6 +61,7 @@
    CXX="$save_CXX"
 fi
 AC_SUBST(LINKER,[$LINKER])
+AC_SUBST(CXXLIB)
 
 dnl# --------------------------------------------------------------------------
 dnl# Supply default CXXFLAGS, if not specified by `CXXFLAGS=flags ./configure'
@@ -241,7 +245,9 @@
 
 AC_ARG_WITH(afterimage_config,
   [  --with-afterimage-config=DIR  use libAfterImage config script in DIR],
-  [afterimage_config="$withval"])
+  [if test "x$withval" != x; then
+    afterimage_config=$withval/afterimage-config
+  fi])
 
 AC_ARG_ENABLE(afterstep,
   [  --enable-afterstep enable integration with AfterStep window manager],
@@ -439,12 +445,6 @@
 
 dnl# --------------------------------------------------------------------------
 
-AC_PATH_PROG(MV, mv, mv)
-AC_PATH_PROG(CP, cp, cp)
-AC_PATH_PROG(LN, ln, ln)
-AC_PATH_PROG(SED, sed, sed)
-AC_PATH_PROG(ECHO, echo, echo)
-AC_PATH_PROG(CMP, cmp, cmp)
 AC_PATH_PROG(TIC, tic)
 
 dnl# need a neat way to detect SVR4 or its features
@@ -469,33 +469,27 @@
 AFTERIMAGE_LIBS=
 have_afterimage=
 
-if test x$support_afterimage == xyes; then
-	AC_MSG_CHECKING(installed libAfterImage)
-	support_afterimage=no
-	if test "x$afterimage_config" = "x" ; 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
@@ -751,10 +745,7 @@
 else
 exit (1);}]])],[dnl
   rxvt_cv_func_xlocale=yes],[rxvt_cv_func_xlocale=no],[dnl
-  AC_MSG_WARN(Define NO_XLOCALE in config.h manually)])])
-if test x$rxvt_cv_func_xlocale = xyes; then
-  AC_DEFINE(HAVE_XLOCALE, 1, Define if Xlocale support works)
-fi
+  :])])
 
 AC_CACHE_CHECK(for working X setlocale, rxvt_cv_func_xsetlocale,
 [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define X_LOCALE 1
@@ -963,8 +954,6 @@
    support_frills=yes
 fi
 
-AC_SUBST(DEBUG)
-AC_SUBST(DINCLUDE)
 AC_SUBST(CFLAGS)
 AC_SUBST(CPPFLAGS)
 AC_SUBST(LDFLAGS)
@@ -972,13 +961,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)
@@ -1034,11 +1021,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