--- cvsroot/rxvt-unicode/configure	2006/01/21 22:34:05	1.86
+++ cvsroot/rxvt-unicode/configure	2006/01/22 04:09:16	1.89
@@ -10588,7 +10588,7 @@
 if test $ac_cv_header_utmp_h = yes; then
   echo "$as_me:$LINENO: checking for struct utmp" >&5
 echo $ECHO_N "checking for struct utmp... $ECHO_C" >&6
-if test "${rxvt_cv_struct_utmp+set}" = set; then
+if test "${struct_utmp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -10628,18 +10628,18 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  rxvt_cv_struct_utmp=yes
+  struct_utmp=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-rxvt_cv_struct_utmp=no
+struct_utmp=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $rxvt_cv_struct_utmp" >&5
-echo "${ECHO_T}$rxvt_cv_struct_utmp" >&6
-if test x$rxvt_cv_struct_utmp = xyes; then
+echo "$as_me:$LINENO: result: $struct_utmp" >&5
+echo "${ECHO_T}$struct_utmp" >&6
+if test x$struct_utmp = xyes; then
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_STRUCT_UTMP 1
@@ -10650,7 +10650,7 @@
 
 echo "$as_me:$LINENO: checking for ut_host in utmp struct" >&5
 echo $ECHO_N "checking for ut_host in utmp struct... $ECHO_C" >&6
-if test "${rxvt_cv_struct_utmp_host+set}" = set; then
+if test "${struct_utmp_host+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -10690,18 +10690,18 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  rxvt_cv_struct_utmp_host=yes
+  struct_utmp_host=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-rxvt_cv_struct_utmp_host=no
+struct_utmp_host=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $rxvt_cv_struct_utmp_host" >&5
-echo "${ECHO_T}$rxvt_cv_struct_utmp_host" >&6
-if test x$rxvt_cv_struct_utmp_host = xyes; then
+echo "$as_me:$LINENO: result: $struct_utmp_host" >&5
+echo "${ECHO_T}$struct_utmp_host" >&6
+if test x$struct_utmp_host = xyes; then
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_UTMP_HOST 1
@@ -10711,7 +10711,7 @@
 
 echo "$as_me:$LINENO: checking for ut_pid in utmp struct" >&5
 echo $ECHO_N "checking for ut_pid in utmp struct... $ECHO_C" >&6
-if test "${rxvt_cv_struct_utmp_pid+set}" = set; then
+if test "${struct_utmp_pid+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -10751,18 +10751,18 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  rxvt_cv_struct_utmp_pid=yes
+  struct_utmp_pid=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-rxvt_cv_struct_utmp_pid=no
+struct_utmp_pid=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $rxvt_cv_struct_utmp_pid" >&5
-echo "${ECHO_T}$rxvt_cv_struct_utmp_pid" >&6
-if test x$rxvt_cv_struct_utmp_pid = xyes; then
+echo "$as_me:$LINENO: result: $struct_utmp_pid" >&5
+echo "${ECHO_T}$struct_utmp_pid" >&6
+if test x$struct_utmp_pid = xyes; then
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_UTMP_PID 1
@@ -10913,7 +10913,7 @@
 if test $ac_cv_header_utmpx_h = yes; then
   echo "$as_me:$LINENO: checking for struct utmpx" >&5
 echo $ECHO_N "checking for struct utmpx... $ECHO_C" >&6
-if test "${rxvt_cv_struct_utmpx+set}" = set; then
+if test "${struct_utmpx+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -10953,18 +10953,18 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  rxvt_cv_struct_utmpx=yes
+  struct_utmpx=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-rxvt_cv_struct_utmpx=no
+struct_utmpx=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $rxvt_cv_struct_utmpx" >&5
-echo "${ECHO_T}$rxvt_cv_struct_utmpx" >&6
-if test x$rxvt_cv_struct_utmpx = xyes; then
+echo "$as_me:$LINENO: result: $struct_utmpx" >&5
+echo "${ECHO_T}$struct_utmpx" >&6
+if test x$struct_utmpx = xyes; then
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_STRUCT_UTMPX 1
@@ -10975,7 +10975,7 @@
 
 echo "$as_me:$LINENO: checking for host in utmpx struct" >&5
 echo $ECHO_N "checking for host in utmpx struct... $ECHO_C" >&6
-if test "${rxvt_cv_struct_utmpx_host+set}" = set; then
+if test "${struct_utmpx_host+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -11015,18 +11015,18 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  rxvt_cv_struct_utmpx_host=yes
+  struct_utmpx_host=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-rxvt_cv_struct_utmpx_host=no
+struct_utmpx_host=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $rxvt_cv_struct_utmpx_host" >&5
-echo "${ECHO_T}$rxvt_cv_struct_utmpx_host" >&6
-if test x$rxvt_cv_struct_utmpx_host = xyes; then
+echo "$as_me:$LINENO: result: $struct_utmpx_host" >&5
+echo "${ECHO_T}$struct_utmpx_host" >&6
+if test x$struct_utmpx_host = xyes; then
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_UTMPX_HOST 1
@@ -11036,7 +11036,7 @@
 
 echo "$as_me:$LINENO: checking for session in utmpx struct" >&5
 echo $ECHO_N "checking for session in utmpx struct... $ECHO_C" >&6
-if test "${rxvt_cv_struct_utmpx_session+set}" = set; then
+if test "${struct_utmpx_session+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -11076,18 +11076,18 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  rxvt_cv_struct_utmpx_session=yes
+  struct_utmpx_session=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-rxvt_cv_struct_utmpx_session=no
+struct_utmpx_session=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $rxvt_cv_struct_utmpx_session" >&5
-echo "${ECHO_T}$rxvt_cv_struct_utmpx_session" >&6
-if test x$rxvt_cv_struct_utmpx_session = xyes; then
+echo "$as_me:$LINENO: result: $struct_utmpx_session" >&5
+echo "${ECHO_T}$struct_utmpx_session" >&6
+if test x$struct_utmpx_session = xyes; then
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_UTMPX_SESSION 1
@@ -11100,7 +11100,7 @@
 
 echo "$as_me:$LINENO: checking for struct lastlog" >&5
 echo $ECHO_N "checking for struct lastlog... $ECHO_C" >&6
-if test "${rxvt_cv_struct_lastlog+set}" = set; then
+if test "${struct_lastlog+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -11144,18 +11144,18 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  rxvt_cv_struct_lastlog=yes
+  struct_lastlog=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-rxvt_cv_struct_lastlog=no
+struct_lastlog=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $rxvt_cv_struct_lastlog" >&5
-echo "${ECHO_T}$rxvt_cv_struct_lastlog" >&6
-if test x$rxvt_cv_struct_lastlog = xyes; then
+echo "$as_me:$LINENO: result: $struct_lastlog" >&5
+echo "${ECHO_T}$struct_lastlog" >&6
+if test x$struct_lastlog = xyes; then
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_STRUCT_LASTLOG 1
@@ -11165,7 +11165,7 @@
 
 echo "$as_me:$LINENO: checking for struct lastlogx" >&5
 echo $ECHO_N "checking for struct lastlogx... $ECHO_C" >&6
-if test "${rxvt_cv_struct_lastlogx+set}" = set; then
+if test "${struct_lastlogx+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -11209,18 +11209,18 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  rxvt_cv_struct_lastlogx=yes
+  struct_lastlogx=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-rxvt_cv_struct_lastlogx=no
+struct_lastlogx=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $rxvt_cv_struct_lastlogx" >&5
-echo "${ECHO_T}$rxvt_cv_struct_lastlogx" >&6
-if test x$rxvt_cv_struct_lastlogx = xyes; then
+echo "$as_me:$LINENO: result: $struct_lastlogx" >&5
+echo "${ECHO_T}$struct_lastlogx" >&6
+if test x$struct_lastlogx = xyes; then
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_STRUCT_LASTLOGX 1
@@ -11231,12 +11231,12 @@
 
 echo "$as_me:$LINENO: checking where utmp is located" >&5
 echo $ECHO_N "checking where utmp is located... $ECHO_C" >&6
-if test "${rxvt_cv_path_utmp+set}" = set; then
+if test "${path_utmp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test "$cross_compiling" = yes; then
-    { echo "$as_me:$LINENO: WARNING: Define RXVT_UTMP_FILE in config.h manually" >&5
-echo "$as_me: WARNING: Define RXVT_UTMP_FILE in config.h manually" >&2;}
+    { echo "$as_me:$LINENO: WARNING: Define UTMP_FILE in config.h manually" >&5
+echo "$as_me: WARNING: Define UTMP_FILE in config.h manually" >&2;}
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -11282,24 +11282,24 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  rxvt_cv_path_utmp=`cat conftestval`
+  path_utmp=`cat conftestval`
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
-rxvt_cv_path_utmp=
+path_utmp=
 fi
 rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:$LINENO: result: $rxvt_cv_path_utmp" >&5
-echo "${ECHO_T}$rxvt_cv_path_utmp" >&6
-if test x$rxvt_cv_path_utmp != x; then
+echo "$as_me:$LINENO: result: $path_utmp" >&5
+echo "${ECHO_T}$path_utmp" >&6
+if test x$path_utmp != x; then
 
 cat >>confdefs.h <<_ACEOF
-#define RXVT_UTMP_FILE "$rxvt_cv_path_utmp"
+#define UTMP_FILE "$path_utmp"
 _ACEOF
 
 fi
@@ -11307,12 +11307,12 @@
 
 echo "$as_me:$LINENO: checking where utmpx is located" >&5
 echo $ECHO_N "checking where utmpx is located... $ECHO_C" >&6
-if test "${rxvt_cv_path_utmpx+set}" = set; then
+if test "${path_utmpx+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test "$cross_compiling" = yes; then
-    { echo "$as_me:$LINENO: WARNING: Define RXVT_UTMPX_FILE in config.h manually" >&5
-echo "$as_me: WARNING: Define RXVT_UTMPX_FILE in config.h manually" >&2;}
+    { echo "$as_me:$LINENO: WARNING: Define UTMPX_FILE in config.h manually" >&5
+echo "$as_me: WARNING: Define UTMPX_FILE in config.h manually" >&2;}
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -11368,24 +11368,24 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  rxvt_cv_path_utmpx=`cat conftestval`
+  path_utmpx=`cat conftestval`
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
-rxvt_cv_path_utmpx=
+path_utmpx=
 fi
 rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:$LINENO: result: $rxvt_cv_path_utmpx" >&5
-echo "${ECHO_T}$rxvt_cv_path_utmpx" >&6
-if test x$rxvt_cv_path_utmpx != x; then
+echo "$as_me:$LINENO: result: $path_utmpx" >&5
+echo "${ECHO_T}$path_utmpx" >&6
+if test x$path_utmpx != x; then
 
 cat >>confdefs.h <<_ACEOF
-#define RXVT_UTMPX_FILE "$rxvt_cv_path_utmpx"
+#define UTMPX_FILE "$path_utmpx"
 _ACEOF
 
 fi
@@ -11393,12 +11393,12 @@
 
 echo "$as_me:$LINENO: checking where wtmp is located" >&5
 echo $ECHO_N "checking where wtmp is located... $ECHO_C" >&6
-if test "${rxvt_cv_path_wtmp+set}" = set; then
+if test "${path_wtmp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test "$cross_compiling" = yes; then
-    { echo "$as_me:$LINENO: WARNING: Define RXVT_WTMP_FILE in config.h manually" >&5
-echo "$as_me: WARNING: Define RXVT_WTMP_FILE in config.h manually" >&2;}
+    { echo "$as_me:$LINENO: WARNING: Define WTMP_FILE in config.h manually" >&5
+echo "$as_me: WARNING: Define WTMP_FILE in config.h manually" >&2;}
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -11446,36 +11446,36 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  rxvt_cv_path_wtmp=`cat conftestval`
+  path_wtmp=`cat conftestval`
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
-rxvt_cv_path_wtmp=
+path_wtmp=
 fi
 rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:$LINENO: result: $rxvt_cv_path_wtmp" >&5
-echo "${ECHO_T}$rxvt_cv_path_wtmp" >&6
-if test x$rxvt_cv_path_wtmp != x; then
+echo "$as_me:$LINENO: result: $path_wtmp" >&5
+echo "${ECHO_T}$path_wtmp" >&6
+if test x$path_wtmp != x; then
 
 cat >>confdefs.h <<_ACEOF
-#define RXVT_WTMP_FILE "$rxvt_cv_path_wtmp"
+#define WTMP_FILE "$path_wtmp"
 _ACEOF
 
 fi
 
 echo "$as_me:$LINENO: checking where wtmpx is located" >&5
 echo $ECHO_N "checking where wtmpx is located... $ECHO_C" >&6
-if test "${rxvt_cv_path_wtmpx+set}" = set; then
+if test "${path_wtmpx+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test "$cross_compiling" = yes; then
-    { echo "$as_me:$LINENO: WARNING: Define RXVT_WTMPX_FILE in config.h manually" >&5
-echo "$as_me: WARNING: Define RXVT_WTMPX_FILE in config.h manually" >&2;}
+    { echo "$as_me:$LINENO: WARNING: Define WTMPX_FILE in config.h manually" >&5
+echo "$as_me: WARNING: Define WTMPX_FILE in config.h manually" >&2;}
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -11522,36 +11522,36 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  rxvt_cv_path_wtmpx=`cat conftestval`
+  path_wtmpx=`cat conftestval`
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
-rxvt_cv_path_wtmpx=
+path_wtmpx=
 fi
 rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:$LINENO: result: $rxvt_cv_path_wtmpx" >&5
-echo "${ECHO_T}$rxvt_cv_path_wtmpx" >&6
-if test x$rxvt_cv_path_wtmpx != x; then
+echo "$as_me:$LINENO: result: $path_wtmpx" >&5
+echo "${ECHO_T}$path_wtmpx" >&6
+if test x$path_wtmpx != x; then
 
 cat >>confdefs.h <<_ACEOF
-#define RXVT_WTMPX_FILE "$rxvt_cv_path_wtmpx"
+#define WTMPX_FILE "$path_wtmpx"
 _ACEOF
 
 fi
 
 echo "$as_me:$LINENO: checking where lastlog is located" >&5
 echo $ECHO_N "checking where lastlog is located... $ECHO_C" >&6
-if test "${rxvt_cv_path_lastlog+set}" = set; then
+if test "${path_lastlog+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test "$cross_compiling" = yes; then
-    { echo "$as_me:$LINENO: WARNING: Define RXVT_LASTLOG_FILE in config.h manually" >&5
-echo "$as_me: WARNING: Define RXVT_LASTLOG_FILE in config.h manually" >&2;}
+    { echo "$as_me:$LINENO: WARNING: Define LASTLOG_FILE in config.h manually" >&5
+echo "$as_me: WARNING: Define LASTLOG_FILE in config.h manually" >&2;}
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -11603,27 +11603,27 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  rxvt_cv_path_lastlog=`cat conftestval`
+  path_lastlog=`cat conftestval`
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
-rxvt_cv_path_lastlog=
+path_lastlog=
 fi
 rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:$LINENO: result: $rxvt_cv_path_lastlog" >&5
-echo "${ECHO_T}$rxvt_cv_path_lastlog" >&6
-if test x$rxvt_cv_path_lastlog != x; then
+echo "$as_me:$LINENO: result: $path_lastlog" >&5
+echo "${ECHO_T}$path_lastlog" >&6
+if test x$path_lastlog != x; then
 
 cat >>confdefs.h <<_ACEOF
-#define RXVT_LASTLOG_FILE "$rxvt_cv_path_lastlog"
+#define LASTLOG_FILE "$path_lastlog"
 _ACEOF
 
-  if test -d "$rxvt_cv_path_lastlog"; then
+  if test -d "$path_lastlog"; then
 
 cat >>confdefs.h <<\_ACEOF
 #define LASTLOG_IS_DIR 1
@@ -11634,12 +11634,12 @@
 
 echo "$as_me:$LINENO: checking where lastlogx is located" >&5
 echo $ECHO_N "checking where lastlogx is located... $ECHO_C" >&6
-if test "${rxvt_cv_path_lastlogx+set}" = set; then
+if test "${path_lastlogx+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test "$cross_compiling" = yes; then
-    { echo "$as_me:$LINENO: WARNING: Define RXVT_LASTLOGX_FILE in config.h manually" >&5
-echo "$as_me: WARNING: Define RXVT_LASTLOGX_FILE in config.h manually" >&2;}
+    { echo "$as_me:$LINENO: WARNING: Define LASTLOGX_FILE in config.h manually" >&5
+echo "$as_me: WARNING: Define LASTLOGX_FILE in config.h manually" >&2;}
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -11685,24 +11685,24 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  rxvt_cv_path_lastlogx=`cat conftestval`
+  path_lastlogx=`cat conftestval`
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
-rxvt_cv_path_lastlogx=
+path_lastlogx=
 fi
 rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:$LINENO: result: $rxvt_cv_path_lastlogx" >&5
-echo "${ECHO_T}$rxvt_cv_path_lastlogx" >&6
-if test x$rxvt_cv_path_lastlogx != x; then
+echo "$as_me:$LINENO: result: $path_lastlogx" >&5
+echo "${ECHO_T}$path_lastlogx" >&6
+if test x$path_lastlogx != x; then
 
 cat >>confdefs.h <<_ACEOF
-#define RXVT_LASTLOGX_FILE "$rxvt_cv_path_lastlogx"
+#define LASTLOGX_FILE "$path_lastlogx"
 _ACEOF
 
 fi
@@ -11983,9 +11983,10 @@
 
 fi
 
+
 echo "$as_me:$LINENO: checking for unix-compliant filehandle passing ability" >&5
 echo $ECHO_N "checking for unix-compliant filehandle passing ability... $ECHO_C" >&6
-if test "${rxvt_can_pass_fds+set}" = set; then
+if test "${can_pass_fds+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -12053,30 +12054,31 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  rxvt_can_pass_fds=yes
+  can_pass_fds=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-rxvt_can_pass_fds=no
+can_pass_fds=no
 fi
 rm -f conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $rxvt_can_pass_fds" >&5
-echo "${ECHO_T}$rxvt_can_pass_fds" >&6
-if test x$rxvt_can_pass_fds = xyes; then
+echo "$as_me:$LINENO: result: $can_pass_fds" >&5
+echo "${ECHO_T}$can_pass_fds" >&6
+if test x$can_pass_fds = xyes; then
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_UNIX_FDPASS 1
 _ACEOF
 
 else
-   { { echo "$as_me:$LINENO: error: urxvt requires unix-compliant filehandle passing ability" >&5
-echo "$as_me: error: urxvt requires unix-compliant filehandle passing ability" >&2;}
+   { { echo "$as_me:$LINENO: error: libptytty requires unix-compliant filehandle passing ability" >&5
+echo "$as_me: error: libptytty requires unix-compliant filehandle passing ability" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
+
 echo "$as_me:$LINENO: checking for broken XIM callback" >&5
 echo $ECHO_N "checking for broken XIM callback... $ECHO_C" >&6
 if test "${rxvt_broken_ximcb+set}" = set; then
@@ -14764,22 +14766,17 @@
   echo "  Xpm library:                $XPM_LIBS"
 fi
 
-echo "
-The following are set in config.h
-"
 if test x$support_utmp != xyes; then
   echo "  utmp support:               disabled"
   echo
 else
   echo "  utmp support:               enabled
-  utmp file:                  $rxvt_cv_path_utmp
-  utmpx file:                 $rxvt_cv_path_utmpx
-  wtmp file:                  $rxvt_cv_path_wtmp
-  wtmpx file:                 $rxvt_cv_path_wtmpx
-  lastlog file:               $rxvt_cv_path_lastlog
-  ttys/ttytab file:           $rxvt_cv_path_ttytab
-  embedded perl:              $support_perl"
-  echo
+  utmp file:                  $path_utmp
+  utmpx file:                 $path_utmpx
+  wtmp file:                  $path_wtmp
+  wtmpx file:                 $path_wtmpx
+  lastlog file:               $path_lastlog
+  lastlogx file:              $path_lastlogx"
 fi
 if test x$term != x; then
   echo "  set TERM to:                $term"
@@ -14793,6 +14790,8 @@
    echo "  resource class fallback:    $RESFALLBACK"
 fi
 echo
+echo "  embedded perl:              $support_perl"
+echo
 if test x$support_xpm = xneedsmanualspecification; then
   echo ".----------------------------------------------------------------."
   echo ". WARNING: --enable-xpm-background was specified however the     ."