--- rxvt-unicode/config.h.in	2010/12/13 17:04:24	1.35
+++ rxvt-unicode/config.h.in	2012/06/10 16:17:39	1.45
@@ -3,9 +3,6 @@
 /* Define if you want to have sexy-looking background pixmaps. */
 #undef BG_IMAGE_FROM_FILE
 
-/* clone device filename */
-#undef CLONE_DEVICE
-
 /* Define if you want 8 bit control sequences */
 #undef EIGHT_BIT_CONTROLS
 
@@ -45,27 +42,21 @@
 /* Define if you want extended chinese codesets */
 #undef ENCODING_ZH_EXT
 
-/* Define if you want to use libAfterImage for image processing */
-#undef HAVE_AFTERIMAGE
-
 /* Define to 1 if you have the `clock_gettime' function. */
 #undef HAVE_CLOCK_GETTIME
 
-/* "use syscall interface for clock_gettime" */
+/* Define to 1 to use the syscall interface for clock_gettime */
 #undef HAVE_CLOCK_SYSCALL
 
-/* Define to 1 if you have the <cwchar> header file. */
-#undef HAVE_CWCHAR
-
-/* Define to 1 if you have /dev/ptmx */
-#undef HAVE_DEV_PTMX
-
 /* Define to 1 if you have the `epoll_ctl' function. */
 #undef HAVE_EPOLL_CTL
 
 /* Define to 1 if you have the `eventfd' function. */
 #undef HAVE_EVENTFD
 
+/* Define to 1 if the floor function is available */
+#undef HAVE_FLOOR
+
 /* Define to 1 if you have the <fontconfig/fontconfig.h> header file. */
 #undef HAVE_FONTCONFIG_FONTCONFIG_H
 
@@ -87,9 +78,6 @@
 /* Define to 1 if you have the <lastlog.h> header file. */
 #undef HAVE_LASTLOG_H
 
-/* Define to 1 if you have the `m' library (-lm). */
-#undef HAVE_LIBM
-
 /* Define to 1 if you have the `rt' library (-lrt). */
 #undef HAVE_LIBRT
 
@@ -138,9 +126,6 @@
 /* Define to 1 if you have the `seteuid' function. */
 #undef HAVE_SETEUID
 
-/* Define if plain old setlocale works */
-#undef HAVE_SETLOCALE
-
 /* Define to 1 if you have the `setresuid' function. */
 #undef HAVE_SETRESUID
 
@@ -153,6 +138,9 @@
 /* Define to 1 if you have the `signalfd' function. */
 #undef HAVE_SIGNALFD
 
+/* Define if freedesktop startup notifications should be supported */
+#undef HAVE_STARTUP_NOTIFICATION
+
 /* Define to 1 if you have the <stdint.h> header file. */
 #undef HAVE_STDINT_H
 
@@ -168,16 +156,16 @@
 /* Define to 1 if you have the <stropts.h> header file. */
 #undef HAVE_STROPTS_H
 
-/* Define if utmp.h or lastlog.h has struct lastlog */
+/* Define to 1 if the system has the type `struct lastlog'. */
 #undef HAVE_STRUCT_LASTLOG
 
-/* Define if utmpx.h or lastlog.h has struct lastlogx */
+/* Define to 1 if the system has the type `struct lastlogx'. */
 #undef HAVE_STRUCT_LASTLOGX
 
-/* Define if utmp.h has struct utmp */
+/* Define to 1 if the system has the type `struct utmp'. */
 #undef HAVE_STRUCT_UTMP
 
-/* Define if utmpx.h has struct utmpx */
+/* Define to 1 if the system has the type `struct utmpx'. */
 #undef HAVE_STRUCT_UTMPX
 
 /* Define to 1 if you have the <sys/byteorder.h> header file. */
@@ -210,9 +198,6 @@
 /* Define to 1 if you have the <sys/stat.h> header file. */
 #undef HAVE_SYS_STAT_H
 
-/* Define to 1 if you have the <sys/stropts.h> header file. */
-#undef HAVE_SYS_STROPTS_H
-
 /* Define to 1 if you have the <sys/strredir.h> header file. */
 #undef HAVE_SYS_STRREDIR_H
 
@@ -247,9 +232,6 @@
 /* Define if struct utmpx contains ut_host */
 #undef HAVE_UTMPX_HOST
 
-/* Define if struct utmpx contains ut_session */
-#undef HAVE_UTMPX_SESSION
-
 /* Define to 1 if you have the <utmp.h> header file. */
 #undef HAVE_UTMP_H
 
@@ -265,9 +247,6 @@
 /* Define to 1 if you have the <X11/Xft/Xft.h> header file. */
 #undef HAVE_X11_XFT_XFT_H
 
-/* Define if you have XPointer typedef */
-#undef HAVE_XPOINTER
-
 /* Define if setlocale (defined to Xsetlocale) works */
 #undef HAVE_XSETLOCALE
 
@@ -277,12 +256,6 @@
 /* Define if you want ISO 14755 extended support */
 #undef ISO_14755
 
-/* Define location of lastlogx */
-#undef LASTLOGX_FILE
-
-/* Define location of lastlog */
-#undef LASTLOG_FILE
-
 /* Define if you want to have lastlog support when utmp/utmpx is enabled */
 #undef LASTLOG_SUPPORT
 
@@ -343,6 +316,21 @@
 /* Define if you want to hide the pointer while typing */
 #undef POINTER_BLANK
 
+/* Define to a fallback location of lastlogx */
+#undef PT_LASTLOGX_FILE
+
+/* Define to a fallback location of lastlog */
+#undef PT_LASTLOG_FILE
+
+/* Define to a fallback location of utmp */
+#undef PT_UTMP_FILE
+
+/* Define to a fallback location of wtmpx */
+#undef PT_WTMPX_FILE
+
+/* Define to a fallback location of wtmp */
+#undef PT_WTMP_FILE
+
 /* Resource class */
 #undef RESCLASS
 
@@ -415,18 +403,9 @@
    for multibyte characters input */
 #undef USE_XIM
 
-/* Define location of utmp */
-#undef UTMP_FILE
-
 /* Define if you want to have utmp/utmpx support */
 #undef UTMP_SUPPORT
 
-/* Define location of wtmpx */
-#undef WTMPX_FILE
-
-/* Define location of wtmp */
-#undef WTMP_FILE
-
 /* Define if you want to have wtmp support when utmp/utmpx is enabled */
 #undef WTMP_SUPPORT
 
@@ -463,9 +442,13 @@
    #define below would cause a syntax error. */
 #undef _UINT32_T
 
-/* Needed to get declarations for msg_control and msg_controllen on Solaris */
+/* Enable declarations of msg_control and msg_controllen on Solaris */
 #undef _XOPEN_SOURCE
 
+/* Enable declarations in utmp.h on Solaris when the XPG4v2 namespace is
+   active */
+#undef __EXTENSIONS__
+
 /* Define to `int' if <sys/types.h> doesn't define. */
 #undef gid_t