--- rxvt-unicode/configure.ac	2015/06/16 11:56:37	1.152
+++ 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
@@ -452,6 +461,14 @@
 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# --------------------------------------------------------------------------