--- rxvt-unicode/configure.ac	2014/11/02 15:52:39	1.149
+++ rxvt-unicode/configure.ac	2015/06/16 11:56:37	1.152
@@ -423,28 +423,18 @@
 
 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
-  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
-
-  if test x$support_pixbuf = xyes; then
-    AC_MSG_RESULT(ok)
+  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)
-  else
-    AC_MSG_RESULT(no)
-  fi
+  ], [:])
 fi
 
 AC_SUBST(PIXBUF_CFLAGS)
@@ -454,21 +444,9 @@
 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)
@@ -527,8 +505,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,
@@ -570,7 +548,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])])
@@ -593,10 +571,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"
@@ -604,26 +581,20 @@
     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"