--- rxvt-unicode/configure.ac	2012/06/19 20:50:05	1.145
+++ rxvt-unicode/configure.ac	2015/06/16 12:00:07	1.154
@@ -295,10 +295,11 @@
     AC_DEFINE(NO_DELETE_KEY, 1, Define if you don't want support for the (non-keypad) delete key)
   fi])
 
+support_resources=yes
 AC_ARG_ENABLE(resources,
   [  --disable-resources     disable all resource checking],
   [if test x$enableval = xno; then
-    AC_DEFINE(NO_RESOURCES, 1, Define if you don't want any resources read)
+    support_resources=no
   fi])
 
 AC_ARG_ENABLE(8bitctrls,
@@ -412,6 +413,14 @@
     AC_DEFINE_UNQUOTED(RXVT_TERMINFO, "$withval", Set TERMINFO value to the value given by configure) terminfo="$withval"
   fi])
 
+if test x$support_resources = xno; then
+  if test x$support_frills = xyes || test x$support_perl = xyes; then
+    AC_MSG_ERROR([--disable-resources requires --disable-frills --disable-perl])
+  fi
+
+  AC_DEFINE(NO_RESOURCES, 1, Define if you don't want any resources read)
+fi
+
 dnl# --------------------------------------------------------------------------
 
 LIBEV_M4_AVOID_LIBRT=1
@@ -423,30 +432,43 @@
 
 AC_PATH_XTRA
 
+AC_PATH_TOOL(PKG_CONFIG, pkg-config, no)
+
+image_lib=none
+
+PIXBUF_CFLAGS=
+PIXBUF_LIBS=
+
+if test x$support_pixbuf = xyes; then
+  RXVT_CHECK_MODULES([PIXBUF], [gdk-pixbuf-2.0], [
+    image_lib=gdk-pixbuf
+    AC_DEFINE(HAVE_PIXBUF, 1, Define if you want to use gdk-pixbuf for image processing)
+  ], [:])
+fi
+
+AC_SUBST(PIXBUF_CFLAGS)
+AC_SUBST(PIXBUF_LIBS)
+
 STARTUP_NOTIFICATION_CFLAGS=
 STARTUP_NOTIFICATION_LIBS=
 
 if test x$support_startup_notification = xyes; then
-  support_startup_notification=no
-  AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-  AC_MSG_CHECKING(for libstartup-notification)
-  if test $PKG_CONFIG != no && $PKG_CONFIG --exists libstartup-notification-1.0; then
-    STARTUP_NOTIFICATION_CFLAGS="`$PKG_CONFIG libstartup-notification-1.0 --cflags`"
-    STARTUP_NOTIFICATION_LIBS="`$PKG_CONFIG libstartup-notification-1.0 --libs`"
-    support_startup_notification=yes
-  fi
-
-  if test x$support_startup_notification = xyes; then
-    AC_MSG_RESULT(ok)
+  RXVT_CHECK_MODULES([STARTUP_NOTIFICATION], [libstartup-notification-1.0], [
     AC_DEFINE(HAVE_STARTUP_NOTIFICATION, 1, Define if freedesktop startup notifications should be supported)
-  else
-    AC_MSG_RESULT(no)
-  fi
+  ], [:])
 fi
 
 AC_SUBST(STARTUP_NOTIFICATION_CFLAGS)
 AC_SUBST(STARTUP_NOTIFICATION_LIBS)
 
+if test x$support_frills = xyes; then
+  RXVT_CHECK_MODULES([XMU], [xmu], [
+    X_LIBS="$XMU_LIBS $X_LIBS"
+    CPPFLAGS="$CPPFLAGS $XMU_CFLAGS"
+    AC_DEFINE(HAVE_XMU, 1, Define to enable Xmu support)
+  ], [:])
+fi
+
 dnl# --------------------------------------------------------------------------
 dnl# CHECKING FOR HEADER FILES
 dnl# --------------------------------------------------------------------------
@@ -500,8 +522,8 @@
 
 dnl# this is a really hack test for some basic Xlocale stuff
 save_LIBS=$LIBS
-save_CFLAGS=$CFLAGS
-CFLAGS="$CFLAGS $X_CFLAGS"
+save_CXXFLAGS=$CXXFLAGS
+CXXFLAGS="$CXXFLAGS $X_CFLAGS"
 LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11"
 if test x$support_xim = xyes; then
   AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale,
@@ -543,7 +565,7 @@
   AC_DEFINE(HAVE_XSETLOCALE, 1, Define if setlocale (defined to Xsetlocale) works)
 fi
 LIBS=$save_LIBS
-CFLAGS=$save_CFLAGS
+CXXFLAGS=$save_CXXFLAGS
 
 AC_CACHE_CHECK(for working nl_langinfo, rxvt_cv_func_nl_langinfo,
 [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <langinfo.h>]], [[nl_langinfo(CODESET);]])],[rxvt_cv_func_nl_langinfo=yes],[rxvt_cv_func_nl_langinfo=no])])
@@ -566,10 +588,9 @@
 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
-    X_LIBS="`$PKG_CONFIG xrender --libs` $X_LIBS"
-    CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xrender --cflags`"
+  RXVT_CHECK_MODULES([XRENDER], [xrender], [
+    X_LIBS="$XRENDER_LIBS $X_LIBS"
+    CPPFLAGS="$CPPFLAGS $XRENDER_CFLAGS"
     rxvt_have_xrender=yes
 
     save_LIBS="$LIBS"
@@ -577,33 +598,25 @@
     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"
-    CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xft --cflags`"
-  else
+  RXVT_CHECK_MODULES([XFT], [fontconfig xft], [
+    X_LIBS="$XFT_LIBS $X_LIBS"
+    CPPFLAGS="$CPPFLAGS $XFT_CFLAGS"
+  ], [
     AC_PATH_PROG(XFT_CONFIG, xft-config, no)
     if test $XFT_CONFIG != no; then
       X_LIBS="`$XFT_CONFIG --libs` $X_LIBS"
       CPPFLAGS="$CPPFLAGS `$XFT_CONFIG --cflags`"
     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])
+  AC_CHECK_HEADERS(X11/Xft/Xft.h fontconfig/fontconfig.h,,[support_xft=no])
+  AC_CHECK_FUNCS(XftDrawString32 FcPatternGet,,[support_xft=no])
   LIBS="$save_LIBS"
 
   if test x$support_xft = xyes; then
@@ -611,43 +624,27 @@
   fi
 fi
 
-image_lib=none
-
-PIXBUF_CFLAGS=
-PIXBUF_LIBS=
-
 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
-    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-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
+  AC_MSG_CHECKING(for Render >= 0.11)
+  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+#include <X11/extensions/Xrender.h>
+#if RENDER_MAJOR == 0 && RENDER_MINOR <= 10
+error
+#endif
+]])],[],[support_image=no])
+  if test x$support_image = xyes; then
+    AC_MSG_RESULT(ok)
+    LIBS="$LIBS -lm"
+    AC_DEFINE(XRENDER, 1, Define to enable xrender support)
 
-    if test x$support_pixbuf = xyes; then
-      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)
+    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
+  else
+    AC_MSG_RESULT(no)
   fi
 fi
 
-AC_SUBST(PIXBUF_CFLAGS)
-AC_SUBST(PIXBUF_LIBS)
-
 if test x$support_styles = xyes; then
   AC_DEFINE(ENABLE_STYLES, 1, Define if you want bold and italic support)
 fi