--- rxvt-unicode/ptytty.m4	2006/01/23 10:41:16	1.5
+++ rxvt-unicode/ptytty.m4	2007/11/05 00:50:05	1.11
@@ -17,6 +17,10 @@
   getpt \
   posix_openpt \
   isastream \
+  setuid \
+  seteuid \
+  setreuid \
+  setresuid \
 )
 
 have_clone=no
@@ -81,19 +85,19 @@
 support_lastlog=yes
 
 AC_ARG_ENABLE(utmp,
-  [  --enable-utmp           enable utmp (utmpx) support],
+  [AS_HELP_STRING([--enable-utmp],[enable utmp (utmpx) support])],
   [if test x$enableval = xyes -o x$enableval = xno; then
     support_utmp=$enableval
   fi])
 
 AC_ARG_ENABLE(wtmp,
-  [  --enable-wtmp           enable wtmp (wtmpx) support (requires --enable-utmp)],
+  [AS_HELP_STRING([--enable-wtmp],[enable wtmp (wtmpx) support (requires --enable-utmp)])],
   [if test x$enableval = xyes -o x$enableval = xno; then
     support_wtmp=$enableval
   fi])
 
 AC_ARG_ENABLE(lastlog,
-  [  --enable-lastlog        enable lastlog support (requires --enable-utmp)],
+  [AS_HELP_STRING([--enable-lastlog],[enable lastlog support (requires --enable-utmp)])],
   [if test x$enableval = xyes -o x$enableval = xno; then
     support_lastlog=$enableval
   fi])
@@ -109,9 +113,9 @@
 fi
 
 AC_CHECK_FUNCS( \
-	ttyslot \
 	updwtmp \
 	updwtmpx \
+	updlastlogx \
 )
 
 AC_CHECK_HEADERS( \
@@ -210,6 +214,7 @@
 dnl# find utmp
 AC_CACHE_CHECK(where utmp is located, path_utmp,
 [AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdio.h>
+#include <stdlib.h>
 #include <sys/types.h>
 #include <utmp.h>
 #include <errno.h>
@@ -246,6 +251,7 @@
 dnl# a day newer, then dump the utmpx.  People leave lots of junk around.
 AC_CACHE_CHECK(where utmpx is located, path_utmpx,
 [AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdio.h>
+#include <stdlib.h>
 #include <sys/types.h>
 #include <utmpx.h>
 #include <errno.h>
@@ -291,6 +297,7 @@
 dnl# find wtmp
 AC_CACHE_CHECK(where wtmp is located, path_wtmp,
 [AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdio.h>
+#include <stdlib.h>
 #include <sys/types.h>
 #ifdef HAVE_UTMP_H
 #include <utmp.h>
@@ -299,7 +306,7 @@
 main()
 {
     char **w, *wtmplist[] = {
-    "/var/log/wtmp", "/var/adm/wtmp", "/etc/wtmp", "/usr/etc/wtmp", "/usr/adm/wtmp", NULL }; 
+    "/var/log/wtmp", "/var/adm/wtmp", "/etc/wtmp", "/usr/etc/wtmp", "/usr/adm/wtmp", NULL };
     FILE *a, *f=fopen("conftestval", "w");
     if (!f) exit(1);
 #ifdef WTMP_FILE
@@ -327,6 +334,7 @@
 dnl# find wtmpx
 AC_CACHE_CHECK(where wtmpx is located, path_wtmpx,
 [AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdio.h>
+#include <stdlib.h>
 #ifdef HAVE_UTMPX_H
 #include <utmpx.h>
 #endif
@@ -334,7 +342,7 @@
 main()
 {
     char **w, *wtmplist[] = {
-    "/var/log/wtmpx", "/var/adm/wtmpx", NULL }; 
+    "/var/log/wtmpx", "/var/adm/wtmpx", NULL };
     FILE *a, *f=fopen("conftestval", "w");
     if (!f) exit(1);
 #ifdef WTMPX_FILE
@@ -362,6 +370,7 @@
 dnl# find lastlog
 AC_CACHE_CHECK(where lastlog is located, path_lastlog,
 [AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdio.h>
+#include <stdlib.h>
 #include <sys/types.h>
 #ifdef HAVE_UTMPX_H
 #include <utmpx.h>
@@ -396,15 +405,13 @@
   AC_MSG_WARN(Define LASTLOG_FILE in config.h manually)])])
 if test x$path_lastlog != x; then
   AC_DEFINE_UNQUOTED(LASTLOG_FILE, "$path_lastlog", Define location of lastlog)
-  if test -d "$path_lastlog"; then
-    AC_DEFINE(LASTLOG_IS_DIR, 1, Define if lastlog is provided via a directory)
-  fi
 fi
 dnl# --------------------------------------------------------------------------
 
 dnl# find lastlogx
 AC_CACHE_CHECK(where lastlogx is located, path_lastlogx,
 [AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdio.h>
+#include <stdlib.h>
 #ifdef HAVE_UTMPX_H
 #include <utmpx.h>
 #endif
@@ -434,26 +441,13 @@
 if test x$path_lastlogx != x; then
   AC_DEFINE_UNQUOTED(LASTLOGX_FILE, "$path_lastlogx", Define location of lastlogx)
 fi
-
-if test x$support_utmp != xyes; then
-  echo "  utmp support:               disabled"
-  echo
-else
-  echo "  utmp support:               enabled
-  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
 ])
 
 AC_DEFUN([SCM_RIGHTS_CHECK],
 [
 AC_CACHE_CHECK(for unix-compliant filehandle passing ability, can_pass_fds,
 [AC_TRY_LINK([
-#include <cstddef> // broken bsds (is that redundant) need this
+#include <cstddef> // broken bsds (is that redundant?) need this
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/uio.h>