--- rxvt-unicode/config.h.in	2011/11/15 01:13:49	1.40
+++ rxvt-unicode/config.h.in	2012/01/21 12:44:11	1.44
@@ -51,9 +51,6 @@
 /* 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 the `epoll_ctl' function. */
 #undef HAVE_EPOLL_CTL
 
@@ -132,9 +129,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
 
@@ -207,9 +201,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
 
@@ -244,9 +235,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
 
@@ -271,12 +259,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
 
@@ -337,6 +319,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
 
@@ -409,18 +406,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
 
@@ -457,9 +445,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