--- libptytty/ptytty.m4	2006/01/25 22:07:21	1.7
+++ libptytty/ptytty.m4	2008/05/05 16:51:28	1.17
@@ -9,6 +9,7 @@
   libutil.h \
   sys/ioctl.h \
   sys/stropts.h \
+  stropts.h \
 )
 
 AC_CHECK_FUNCS( \
@@ -65,8 +66,8 @@
 
 if test x$ac_cv_func_getpt = xyes -o x$ac_cv_func_posix_openpt = xyes -o x$have_clone = xyes; then
   AC_MSG_CHECKING(for UNIX98 ptys)
-  AC_TRY_LINK([#include <stdlib.h>],
-              [grantpt(0);unlockpt(0);ptsname(0);],
+  AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdlib.h>]],
+              [[grantpt(0);unlockpt(0);ptsname(0);]])],
               [unix98_pty=yes
                AC_DEFINE(UNIX98_PTY, 1, "")
                AC_MSG_RESULT(yes)],
@@ -85,19 +86,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])
@@ -113,16 +114,12 @@
 fi
 
 AC_CHECK_FUNCS( \
-	ttyslot \
 	updwtmp \
 	updwtmpx \
+	updlastlogx \
 )
 
-AC_CHECK_HEADERS( \
-	utmp.h \
-	utmpx.h \
-	lastlog.h \
-)
+AC_CHECK_HEADERS(lastlog.h)
 
 dnl# --------------------------------------------------------------------------
 dnl# DO ALL UTMP AND WTMP CHECKING
@@ -130,7 +127,7 @@
 dnl# check for host field in utmp structure
 
 dnl# --------------------------------------------
-AC_CHECK_HEADER(utmp.h,
+AC_CHECK_HEADERS(utmp.h,
 [AC_CACHE_CHECK([for struct utmp], struct_utmp,
 [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
 #include <utmp.h>]], [[struct utmp ut;]])],[struct_utmp=yes],[struct_utmp=no])])
@@ -152,11 +149,11 @@
 if test x$struct_utmp_pid = xyes; then
   AC_DEFINE(HAVE_UTMP_PID, 1, Define if struct utmp contains ut_pid)
 fi
-) dnl# AC_CHECK_HEADER(utmp.h
+) dnl# AC_CHECK_HEADERS(utmp.h
 
 dnl# --------------------------------------------
 
-AC_CHECK_HEADER(utmpx.h,
+AC_CHECK_HEADERS(utmpx.h,
 [AC_CACHE_CHECK([for struct utmpx], struct_utmpx,
 [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
 #include <utmpx.h>]], [[struct utmpx ut;]])],[struct_utmpx=yes],[struct_utmpx=no])])
@@ -173,14 +170,12 @@
 fi
 
 AC_CACHE_CHECK(for session in utmpx struct, struct_utmpx_session,
-[AC_TRY_COMPILE([#include <sys/types.h>
-#include <utmpx.h>],
-[struct utmpx utx; utx.ut_session;],
-struct_utmpx_session=yes, struct_utmpx_session=no)])
+[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
+#include <utmpx.h>]], [[struct utmpx utx; utx.ut_session;]])],[struct_utmpx_session=yes],[struct_utmpx_session=no])])
 if test x$struct_utmpx_session = xyes; then
   AC_DEFINE(HAVE_UTMPX_SESSION, 1, Define if struct utmpx contains ut_session)
 fi
-) dnl# AC_CHECK_HEADER(utmpx.h
+) dnl# AC_CHECK_HEADERS(utmpx.h
 
 dnl# --------------------------------------------------------------------------
 dnl# check for struct lastlog
@@ -214,6 +209,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>
@@ -250,6 +246,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>
@@ -295,6 +292,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>
@@ -303,7 +301,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
@@ -331,6 +329,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
@@ -338,7 +337,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
@@ -366,6 +365,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>
@@ -400,15 +400,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
@@ -438,30 +436,17 @@
 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([
+[AC_LINK_IFELSE([AC_LANG_PROGRAM([[
 #include <cstddef> // broken bsds (is that redundant?) need this
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/uio.h>
-],[
+]], [[
 {
   msghdr msg;
   iovec iov;
@@ -485,7 +470,7 @@
 
   return sendmsg (3, &msg, 0);
 }
-],[can_pass_fds=yes],[can_pass_fds=no])])
+]])],[can_pass_fds=yes],[can_pass_fds=no])])
 if test x$can_pass_fds = xyes; then
    AC_DEFINE(HAVE_UNIX_FDPASS, 1, Define if sys/socket.h defines the necessary macros/functions for file handle passing)
 else
@@ -496,7 +481,7 @@
 AC_DEFUN([TTY_GROUP_CHECK],
 [
 AC_CACHE_CHECK([for tty group], tty_group,
-[AC_TRY_RUN([
+[AC_RUN_IFELSE([AC_LANG_SOURCE([[
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
@@ -516,8 +501,7 @@
     return 0;
   else
     return 1;
-}],
-[tty_group=yes],[tty_group=no],[tty_group=no])])
+}]])],[tty_group=yes],[tty_group=no],[tty_group=no])])
 if test x$tty_group = xyes; then
   AC_DEFINE(TTY_GID_SUPPORT, 1, "")
 fi])