--- rxvt-unicode/configure	2007/06/26 00:40:18	1.105
+++ rxvt-unicode/configure	2007/07/27 10:09:39	1.108
@@ -679,7 +679,6 @@
 GREP
 EGREP
 LINKER
-CXXLIB
 INSTALL_LIBRXVT
 RXVTNAME
 TIC
@@ -707,7 +706,7 @@
 PERLPRIVLIBEXP
 IF_PERL
 PERL_O
-LIBAFTERIMAGE_CFLAGS
+AFTERIMAGE_CFLAGS
 AFTERIMAGE_LIBS
 include_stdint_h
 include_stdarg_h
@@ -3857,11 +3856,8 @@
 	 test ! -s conftest.err
        } && test -s conftest$ac_exeext &&
        $as_test_x conftest$ac_exeext; then
-
-         { echo "$as_me:$LINENO: result: ok" >&5
+  { echo "$as_me:$LINENO: result: ok" >&5
 echo "${ECHO_T}ok" >&6; }
-         CXXLIB="-lsupc++"
-
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -3882,7 +3878,6 @@
 LINKER=$LINKER
 
 
-
 if test -z "$orig_CXXFLAGS"; then
   if test x$GCC = xyes && test "x$GXX" = xyes; then
      CXXFLAGS="-g -O3 -fno-threadsafe-statics -fno-enforce-eh-specs"
@@ -6463,9 +6458,9 @@
 
 
 
-LIBAFTERIMAGE_CFLAGS=
+AFTERIMAGE_CFLAGS=
 AFTERIMAGE_LIBS=
-have_afterimage=
+AFTERIMAGE_VERSION=
 
 if test x$support_afterimage = xyes; then
   support_afterimage=no
@@ -6513,14 +6508,18 @@
 
 
   fi
-
-  { echo "$as_me:$LINENO: checking for libAfterImage" >&5
-echo $ECHO_N "checking for libAfterImage... $ECHO_C" >&6; }
-  if $afterimage_config --version >/dev/null 2>&1 ; then
-    LIBAFTERIMAGE_CFLAGS=`$afterimage_config --cflags`
+  { echo "$as_me:$LINENO: checking for libAfterImage version >= 1.15" >&5
+echo $ECHO_N "checking for libAfterImage version >= 1.15... $ECHO_C" >&6; }
+  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
 
@@ -7486,142 +7485,6 @@
 { echo "$as_me:$LINENO: result: $rxvt_cv_header_sysioctl" >&5
 echo "${ECHO_T}$rxvt_cv_header_sysioctl" >&6; }
 
-if test -n "$GCC"; then
-  LDARG="-Wl,"
-else
-  LDARG=""
-fi
-R_TRANSLATE='s/-L\([^ ]*\)/-L\1 '$LDARG'-rpath '$LDARG'\1/g'
-
-ac_save_CFLAGS=$CFLAGS
-ac_save_LIBS=$LIBS
-CFLAGS="$CFLAGS $X_CFLAGS"
-LIBS=`echo "$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" | sed "$R_TRANSLATE"`
-{ echo "$as_me:$LINENO: checking for -rpath dynamic library path recording" >&5
-echo $ECHO_N "checking for -rpath dynamic library path recording... $ECHO_C" >&6; }
-if test "${rxvt_cv_rpath+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$cross_compiling" = yes; then
-    { echo "$as_me:$LINENO: WARNING: You may need to check the LIBS line" >&5
-echo "$as_me: WARNING: You may need to check the LIBS line" >&2;}
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <X11/Xlib.h>
-#include <stdlib.h>
-main()
-{
-    exit(0);
-    (void) XOpenDisplay("foobar");
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  rxvt_cv_rpath=yes
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-rxvt_cv_rpath=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-
-fi
-{ echo "$as_me:$LINENO: result: $rxvt_cv_rpath" >&5
-echo "${ECHO_T}$rxvt_cv_rpath" >&6; }
-if test x$rxvt_cv_rpath != xyes; then
-    R_TRANSLATE='s/-L\([^ ]*\)/-L\1 '$LDARG'-R\1/g'
-    LIBS=`echo "$ac_save_LIBS $X_LIBS $X_EXTRA_LIBS -lX11" | sed "$R_TRANSLATE"`
-  { echo "$as_me:$LINENO: checking for -R dynamic library path recording" >&5
-echo $ECHO_N "checking for -R dynamic library path recording... $ECHO_C" >&6; }
-if test "${rxvt_cv_R+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$cross_compiling" = yes; then
-  rxvt_cv_R=no
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <X11/Xlib.h>
-#include <stdlib.h>
-main()
-{
-    exit(0);
-    (void) XOpenDisplay("foobar");
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  rxvt_cv_R=yes
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-rxvt_cv_R=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-
-fi
-{ echo "$as_me:$LINENO: result: $rxvt_cv_R" >&5
-echo "${ECHO_T}$rxvt_cv_R" >&6; }
-  if test x$rxvt_cv_R != xyes; then
-    LIBS="$ac_save_LIBS $X_LIBS $X_EXTRA_LIBS -lX11"
-  fi
-fi
-
 { echo "$as_me:$LINENO: checking for XPointer" >&5
 echo $ECHO_N "checking for XPointer... $ECHO_C" >&6; }
 if test "${rxvt_cv_xpointer+set}" = set; then
@@ -7678,8 +7541,6 @@
 _ACEOF
 
 fi
-LIBS=$ac_save_LIBS
-CFLAGS=$ac_save_CFLAGS
 
 { echo "$as_me:$LINENO: checking for XLIB_ILLEGAL_ACCESS" >&5
 echo $ECHO_N "checking for XLIB_ILLEGAL_ACCESS... $ECHO_C" >&6; }
@@ -11819,9 +11680,6 @@
 ac_save_CFLAGS=$CFLAGS
 CFLAGS="$CFLAGS $X_CFLAGS"
 LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11"
-if test x$rxvt_cv_rpath = xyes -o x$rxvt_cv_R = xyes; then
-  LIBS=`echo $LIBS | sed "$R_TRANSLATE"`
-fi
 { echo "$as_me:$LINENO: checking for working Xlocale" >&5
 echo $ECHO_N "checking for working Xlocale... $ECHO_C" >&6; }
 if test "${rxvt_cv_func_xlocale+set}" = set; then
@@ -13239,13 +13097,6 @@
 _ACEOF
 
 fi
-if test x$support_frills = xyes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define ENABLE_FRILLS 1
-_ACEOF
-
-fi
 if test x$support_mousewheel = xyes; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -13565,17 +13416,19 @@
    support_frills=yes
 fi
 
+if test x$support_frills = xyes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define ENABLE_FRILLS 1
+_ACEOF
+
+fi
+
 
 
 
 
 
-if test x$rxvt_cv_rpath = xyes -o x$rxvt_cv_R = xyes; then
-  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
 
 
 
@@ -14353,7 +14206,6 @@
 GREP!$GREP$ac_delim
 EGREP!$EGREP$ac_delim
 LINKER!$LINKER$ac_delim
-CXXLIB!$CXXLIB$ac_delim
 INSTALL_LIBRXVT!$INSTALL_LIBRXVT$ac_delim
 RXVTNAME!$RXVTNAME$ac_delim
 TIC!$TIC$ac_delim
@@ -14381,9 +14233,10 @@
 PERLPRIVLIBEXP!$PERLPRIVLIBEXP$ac_delim
 IF_PERL!$IF_PERL$ac_delim
 PERL_O!$PERL_O$ac_delim
-LIBAFTERIMAGE_CFLAGS!$LIBAFTERIMAGE_CFLAGS$ac_delim
+AFTERIMAGE_CFLAGS!$AFTERIMAGE_CFLAGS$ac_delim
 AFTERIMAGE_LIBS!$AFTERIMAGE_LIBS$ac_delim
 include_stdint_h!$include_stdint_h$ac_delim
+include_stdarg_h!$include_stdarg_h$ac_delim
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -14425,7 +14278,6 @@
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
-include_stdarg_h!$include_stdarg_h$ac_delim
 include_stdlib_h!$include_stdlib_h$ac_delim
 include_unistd_h!$include_unistd_h$ac_delim
 include_string_h!$include_string_h$ac_delim
@@ -14441,7 +14293,7 @@
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 14; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 13; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5