--- rxvt-unicode/configure	2010/07/21 09:06:20	1.133
+++ rxvt-unicode/configure	2010/10/31 08:29:19	1.136
@@ -593,8 +593,6 @@
 
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
-AFTERIMAGE_LIBS
-AFTERIMAGE_CFLAGS
 PERL_O
 IF_PERL
 PERLPRIVLIBEXP
@@ -602,8 +600,12 @@
 PERLLIB
 PERL
 XFT_CONFIG
-PKG_CONFIG
+AFTERIMAGE_LIBS
+AFTERIMAGE_CFLAGS
 afterimage_config
+PIXBUF_LIBS
+PIXBUF_CFLAGS
+PKG_CONFIG
 X_EXTRA_LIBS
 X_LIBS
 X_PRE_LIBS
@@ -690,6 +692,7 @@
 enable_font_styles
 enable_afterimage
 with_afterimage_config
+enable_pixbuf
 enable_transparency
 enable_fading
 enable_rxvt_scroll
@@ -1339,11 +1342,6 @@
   --x-includes=DIR    X include files are in DIR
   --x-libraries=DIR   X library files are in DIR
 
-Program names:
-  --program-prefix=PREFIX            prepend PREFIX to installed program names
-  --program-suffix=SUFFIX            append SUFFIX to installed program names
-  --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
-
 System types:
   --build=BUILD     configure for building on BUILD [guessed]
   --host=HOST       cross-compile to build programs to run on HOST [BUILD]
@@ -1368,6 +1366,7 @@
   --enable-xft            enable xft support on systems that have it
   --enable-font-styles    enable bold and italic support
   --enable-afterimage     enable integration with libAfterImage for background images
+  --enable-pixbuf         enable integration with gdk-pixbuf for background images
   --enable-transparency   enable transparent backgrounds
   --enable-fading         enable colors fading when off focus
   --enable-rxvt-scroll    enable rxvt style scrollbar
@@ -4664,7 +4663,6 @@
 support_scroll_xterm=yes
 support_xim=yes
 support_afterimage=yes
-support_afterstep=yes
 support_xft=yes
 support_unicode3=no
 support_combining=yes
@@ -4696,7 +4694,6 @@
        support_wtmp=no
        support_xim=no
        support_afterimage=no
-       support_afterstep=no
        support_xft=no
        support_unicode3=no
        support_combining=no
@@ -4724,7 +4721,6 @@
        support_wtmp=yes
        support_xim=yes
        support_afterimage=yes
-       support_afterstep=yes
        support_xft=yes
        support_unicode3=yes
        support_combining=yes
@@ -4849,6 +4845,13 @@
 fi
 
 
+# Check whether --enable-pixbuf was given.
+if test "${enable_pixbuf+set}" = set; then :
+  enableval=$enable_pixbuf; if test x$enableval = xyes -o x$enableval = xno; then
+    support_pixbuf=$enableval
+  fi
+fi
+
 
 # Check whether --enable-transparency was given.
 if test "${enable_transparency+set}" = set; then :
@@ -5009,7 +5012,6 @@
 _ACEOF
 
 
-RXVTNAME=`echo "$RXVTNAME"|sed "$program_transform_name"`
 
 
 # Check whether --enable-swapscreen was given.
@@ -6229,6 +6231,82 @@
 fi
 
 
+image_lib=none
+
+PIXBUF_CFLAGS=
+PIXBUF_LIBS=
+
+if test x$support_pixbuf = xyes; then
+  support_pixbuf=no
+  # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+  ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdk-pixbuf" >&5
+$as_echo_n "checking for gdk-pixbuf... " >&6; }
+  if test $PKG_CONFIG != no && $PKG_CONFIG --exists gdk-pixbuf-xlib-2.0; then
+    PIXBUF_CFLAGS="`$PKG_CONFIG gdk-pixbuf-xlib-2.0 --cflags`"
+    PIXBUF_LIBS="`$PKG_CONFIG gdk-pixbuf-xlib-2.0 --libs`"
+    support_pixbuf=yes
+  fi
+
+  if test x$support_pixbuf = xyes; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+$as_echo "ok" >&6; }
+    image_lib=gdk-pixbuf
+    support_afterimage=no
+
+$as_echo "#define HAVE_PIXBUF 1" >>confdefs.h
+
+
+$as_echo "#define BG_IMAGE_FROM_FILE 1" >>confdefs.h
+
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+  fi
+fi
+
+
+
+
 AFTERIMAGE_CFLAGS=
 AFTERIMAGE_LIBS=
 AFTERIMAGE_VERSION=
@@ -6300,6 +6378,13 @@
     if test "x$support_afterimage" = "xyes"; then
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AFTERIMAGE_LIBS" >&5
 $as_echo "$AFTERIMAGE_LIBS" >&6; }
+      image_lib=libafterimage
+
+$as_echo "#define HAVE_AFTERIMAGE 1" >>confdefs.h
+
+
+$as_echo "#define BG_IMAGE_FROM_FILE 1" >>confdefs.h
+
     else
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
@@ -6307,6 +6392,9 @@
   fi
 fi
 
+
+
+
 for ac_header in \
 	sys/byteorder.h \
 	sys/ioctl.h \
@@ -7818,6 +7906,80 @@
 
   fi
 fi
+if test x$support_inheritpixmap = xyes; then
+  support_xrender=yes
+  # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+  ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  if test $PKG_CONFIG != no && $PKG_CONFIG --exists xrender; then
+    X_LIBS="`$PKG_CONFIG xrender --libs` $X_LIBS"
+    CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xrender --cflags`"
+
+    save_LIBS="$LIBS"
+    LIBS="$LIBS $X_LIBS"
+    ac_fn_cxx_check_header_mongrel "$LINENO" "X11/extensions/Xrender.h" "ac_cv_header_X11_extensions_Xrender_h" "$ac_includes_default"
+if test "x$ac_cv_header_X11_extensions_Xrender_h" = x""yes; then :
+
+else
+  support_xrender=no
+fi
+
+
+    ac_fn_cxx_check_func "$LINENO" "XRenderFindStandardFormat" "ac_cv_func_XRenderFindStandardFormat"
+if test "x$ac_cv_func_XRenderFindStandardFormat" = x""yes; then :
+
+else
+  support_xrender=no
+fi
+
+    LIBS="$save_LIBS"
+  fi
+
+  if test x$support_xrender = xyes; then
+    LIBS="$LIBS -lm"
+
+$as_echo "#define XRENDER 1" >>confdefs.h
+
+  fi
+fi
 if test x$support_styles = xyes; then
 
 $as_echo "#define ENABLE_STYLES 1" >>confdefs.h
@@ -7868,15 +8030,6 @@
 $as_echo "#define MOUSE_SLIP_WHEELING 1" >>confdefs.h
 
 fi
-if test x$support_afterimage = xyes; then
-
-$as_echo "#define HAVE_AFTERIMAGE 1" >>confdefs.h
-
-
-$as_echo "#define BG_IMAGE_FROM_FILE 1" >>confdefs.h
-
-fi
-
 
 scrolltypes=plain
 
@@ -8094,28 +8247,6 @@
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-test "$program_prefix" != NONE &&
-  program_transform_name="s&^&$program_prefix&;$program_transform_name"
-# Use a double $ so make ignores it.
-test "$program_suffix" != NONE &&
-  program_transform_name="s&\$&$program_suffix&;$program_transform_name"
-# Double any \ or $.
-# By default was `s,x,x', remove it if useless.
-ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
-program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
-
-
 ac_config_files="$ac_config_files Makefile doc/Makefile src/Makefile"
 
 cat >confcache <<\_ACEOF
@@ -9403,7 +9534,7 @@
 fi
 echo
 echo "  embedded perl:              $support_perl"
-echo "  libafterimage:              $support_afterimage"
+echo "  image library:              $image_lib"
 echo
 if test x$support_xim = xyes -a x$rxvt_cv_func_xlocale = xno; then
   echo ".----------------------------------------------------------------."