--- rxvt-unicode/configure.ac	2012/02/04 21:47:06	1.141
+++ rxvt-unicode/configure.ac	2012/06/29 19:36:11	1.146
@@ -442,7 +442,6 @@
     AC_MSG_RESULT(ok)
     image_lib=gdk-pixbuf
     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.)
   else
     AC_MSG_RESULT(no)
   fi
@@ -588,7 +587,11 @@
 dnl# --------------------------------------------------------------------------
 dnl# now add and remove other stuff
 dnl# --------------------------------------------------------------------------
-if test x$support_xft = xyes || test x$support_inheritpixmap = xyes; then
+support_image=no
+if test x$support_inheritpixmap = xyes || test x$support_pixbuf = xyes; then
+  support_image=yes
+fi
+if test x$support_xft = xyes || test x$support_image = xyes; then
   rxvt_have_xrender=no
   AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
   if test $PKG_CONFIG != no && $PKG_CONFIG --exists xrender; then
@@ -634,6 +637,20 @@
     AC_DEFINE(XFT, 1, Define to enable xft support)
   fi
 fi
+
+if test x$support_image = xyes && test x$rxvt_have_xrender = xyes; then
+  LIBS="$LIBS -lm"
+  AC_DEFINE(XRENDER, 1, Define to enable xrender support)
+
+  if test x$support_inheritpixmap = xyes; then
+    AC_DEFINE(ENABLE_TRANSPARENCY, 1, Define if you want your background to use the parent window background)
+  fi
+
+  if test x$support_pixbuf = xyes; then
+    AC_DEFINE(BG_IMAGE_FROM_FILE, 1, Define if you want to have sexy-looking background pixmaps.)
+  fi
+fi
+
 if test x$support_styles = xyes; then
   AC_DEFINE(ENABLE_STYLES, 1, Define if you want bold and italic support)
 fi
@@ -646,13 +663,6 @@
 if test x$support_fading = xyes; then
   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)
-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)
 fi
@@ -713,8 +723,7 @@
 
 IF_PERL=\#
 if test x$support_perl = xyes; then
-  AC_PATH_PROG(PERL, perl5)
-  AC_PATH_PROG(PERL, perl)
+  AC_PATH_PROG(PERL, perl5, perl)
 
   AC_MSG_CHECKING(for $PERL suitability)
   if $PERL -MExtUtils::Embed -e "use v5.8" >/dev/null 2>/dev/null; then