--- rxvt-unicode/configure.ac	2007/06/26 20:53:07	1.59
+++ rxvt-unicode/configure.ac	2007/08/01 18:10:10	1.68
@@ -48,10 +48,7 @@
    LINKER="$CC"
    AC_LINK_IFELSE(
       [AC_LANG_PROGRAM([struct test { }; void f() try { throw new test; } catch (...) { throw; }],[])],
-      [
-         AC_MSG_RESULT(ok)
-         CXXLIB="-lsupc++"
-      ],
+      [AC_MSG_RESULT(ok)],
       [
          AC_MSG_RESULT([no, making everything bigger and slower])
          LIBS="$save_LIBS"
@@ -61,7 +58,6 @@
    CXX="$save_CXX"
 fi
 AC_SUBST(LINKER,[$LINKER])
-AC_SUBST(CXXLIB)
 
 dnl# --------------------------------------------------------------------------
 dnl# Supply default CXXFLAGS, if not specified by `CXXFLAGS=flags ./configure'
@@ -247,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],
@@ -463,9 +459,9 @@
 dnl# the only reasonable way to find libXpm is do-it-yourself
 dnl# only check if we want xpm-background
 
-LIBAFTERIMAGE_CFLAGS=
+AFTERIMAGE_CFLAGS=
 AFTERIMAGE_LIBS=
-have_afterimage=
+AFTERIMAGE_VERSION=
 
 if test x$support_afterimage = xyes; then
   support_afterimage=no
@@ -473,13 +469,17 @@
   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`
+  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
-      support_afterimage=yes
+      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
+      fi
     fi
   fi
 
@@ -536,8 +536,6 @@
 if test x$rxvt_cv_xpointer = xyes; then
   AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef)
 fi
-LIBS=$ac_save_LIBS
-CFLAGS=$ac_save_CFLAGS
 
 AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_xlib_illegal_access,
 [AC_COMPILE_IFELSE(
@@ -808,9 +806,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)
@@ -917,7 +915,7 @@
 AC_SUBST(X_LIBS)
 AC_SUBST(X_EXTRA_LIBS)
 
-AC_SUBST(LIBAFTERIMAGE_CFLAGS)
+AC_SUBST(AFTERIMAGE_CFLAGS)
 AC_SUBST(AFTERIMAGE_LIBS)
 
 AC_ARG_PROGRAM
@@ -971,9 +969,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"