--- rxvt-unicode/configure.ac	2010/10/13 23:04:56	1.118
+++ rxvt-unicode/configure.ac	2011/01/03 10:32:08	1.124
@@ -433,6 +433,8 @@
 
 AC_PATH_XTRA
 
+image_lib=none
+
 PIXBUF_CFLAGS=
 PIXBUF_LIBS=
 
@@ -440,14 +442,15 @@
   support_pixbuf=no
   AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
   AC_MSG_CHECKING(for gdk-pixbuf)
-  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`"
+  if test $PKG_CONFIG != no && $PKG_CONFIG --exists gdk-pixbuf-2.0; then
+    PIXBUF_CFLAGS="`$PKG_CONFIG gdk-pixbuf-2.0 --cflags`"
+    PIXBUF_LIBS="`$PKG_CONFIG gdk-pixbuf-2.0 --libs`"
     support_pixbuf=yes
   fi
 
   if test x$support_pixbuf = xyes; then
     AC_MSG_RESULT(ok)
+    image_lib=gdk-pixbuf
     support_afterimage=no
     AC_DEFINE(HAVE_PIXBUF, 1, Define if you want to use gdk-pixbuf for image processing)
     AC_DEFINE(BG_IMAGE_FROM_FILE, 1, Define if you want to have sexy-looking background pixmaps.)
@@ -488,6 +491,7 @@
     fi
     if test "x$support_afterimage" = "xyes"; then
       AC_MSG_RESULT($AFTERIMAGE_LIBS)
+      image_lib=libafterimage
       AC_DEFINE(HAVE_AFTERIMAGE, 1, Define if you want to use libAfterImage for image processing)
       AC_DEFINE(BG_IMAGE_FROM_FILE, 1, Define if you want to have sexy-looking background pixmaps.)
     else
@@ -624,7 +628,23 @@
 dnl# --------------------------------------------------------------------------
 dnl# now add and remove other stuff
 dnl# --------------------------------------------------------------------------
-if test x$support_xft = xyes; then
+if test x$support_xft = xyes || test x$support_inheritpixmap = xyes; then
+  rxvt_have_xrender=no
+  AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+  if test $PKG_CONFIG != no && $PKG_CONFIG --exists xrender; then
+    X_LIBS="`$PKG_CONFIG xrender --libs` $X_LIBS"
+    CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xrender --cflags`"
+    rxvt_have_xrender=yes
+
+    save_LIBS="$LIBS"
+    LIBS="$LIBS $X_LIBS"
+    AC_CHECK_HEADER(X11/extensions/Xrender.h,,[rxvt_have_xrender=no])
+    AC_CHECK_FUNC(XRenderFindStandardFormat,,[rxvt_have_xrender=no])
+    LIBS="$save_LIBS"
+  fi
+fi
+
+if test x$support_xft = xyes && test x$rxvt_have_xrender = xyes; then
   AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
   if test $PKG_CONFIG != no && $PKG_CONFIG --exists xft; then
     X_LIBS="`$PKG_CONFIG xft --libs` $X_LIBS"
@@ -637,10 +657,17 @@
     fi
   fi
 
+  if test $PKG_CONFIG != no && $PKG_CONFIG --exists fontconfig; then
+    X_LIBS="`$PKG_CONFIG fontconfig --libs` $X_LIBS"
+    CPPFLAGS="$CPPFLAGS `$PKG_CONFIG fontconfig --cflags`"
+  fi
+
   save_LIBS="$LIBS"
   LIBS="$LIBS $X_LIBS"
   AC_CHECK_HEADERS(X11/Xft/Xft.h,,[support_xft=no])
   AC_CHECK_LIB(Xft,XftDrawString32,:,[support_xft=no])
+  AC_CHECK_HEADERS(fontconfig/fontconfig.h,,[support_xft=no])
+  AC_CHECK_LIB(fontconfig,FcPatternGet,:,[support_xft=no])
   LIBS="$save_LIBS"
 
   if test x$support_xft = xyes; then
@@ -660,8 +687,11 @@
   AC_DEFINE(OFF_FOCUS_FADING, 1, Define if you want faded colors when focus is lost)
 fi
 if test x$support_inheritpixmap = xyes; then
+  if test x$rxvt_have_xrender = xyes; then
+    LIBS="$LIBS -lm"
+    AC_DEFINE(XRENDER, 1, Define to enable xrender support)
+  fi
   AC_DEFINE(ENABLE_TRANSPARENCY, 1, Define if you want your background to use the parent window background)
-  test x$support_xft = xyes && LIBS="$LIBS -lm"
 fi
 if test x$support_keepscrolling = xno; then
   AC_DEFINE(NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING, 1, Define for continual scrolling when you keep the scrollbar button pressed)
@@ -794,7 +824,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 ".----------------------------------------------------------------."