X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Freadutmp.m4;h=a22efcef9b598fe2ae56125f4490eb8b05d381ce;hb=5191b3546cfb6c163228c23f214e325ddf60d46f;hp=6931dc55aa1653a6a23ce052feb2a1fdef5bd257;hpb=8b522e7740bdad094fde01f39e9af3f6db3198e9;p=gnulib.git

diff --git a/m4/readutmp.m4 b/m4/readutmp.m4
index 6931dc55a..a22efcef9 100644
--- a/m4/readutmp.m4
+++ b/m4/readutmp.m4
@@ -1,5 +1,5 @@
-# readutmp.m4 serial 15
-dnl Copyright (C) 2002-2008 Free Software Foundation, Inc.
+# readutmp.m4 serial 20
+dnl Copyright (C) 2002-2013 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -9,20 +9,19 @@ AC_DEFUN([gl_READUTMP],
   dnl Persuade utmpx.h to declare utmpxname
   AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
 
-  AC_CHECK_HEADERS_ONCE(utmp.h utmpx.h)
+  AC_CHECK_HEADERS_ONCE([utmp.h utmpx.h])
   if test $ac_cv_header_utmp_h = yes || test $ac_cv_header_utmpx_h = yes; then
-    AC_LIBOBJ([readutmp])
-
     dnl Prerequisites of lib/readutmp.h and lib/readutmp.c.
-    AC_REQUIRE([AC_C_INLINE])
-    AC_CHECK_FUNCS_ONCE(utmpname utmpxname)
-    AC_CHECK_DECLS(getutent,,,[
+    AC_CHECK_FUNCS_ONCE([utmpname utmpxname])
+    AC_CHECK_DECLS([getutent],,,[[
+/* <sys/types.h> is a prerequisite of <utmp.h> on FreeBSD 8.0, OpenBSD 4.6.  */
+#include <sys/types.h>
 #ifdef HAVE_UTMP_H
 # include <utmp.h>
 #endif
-])
+]])
     utmp_includes="\
-$ac_includes_default
+AC_INCLUDES_DEFAULT
 #ifdef HAVE_UTMPX_H
 # include <utmpx.h>
 #endif