X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Freadutmp.m4;h=8774b202586d6f65304cf7b85278a2d300196c91;hb=21492d6c3ca00ff0827528640804732f2ed66470;hp=bc85c5f4cfbf727c4eb3accaa36abec4f691647d;hpb=57b2981b944bd16fa922ce08919137ed59188a21;p=gnulib.git

diff --git a/m4/readutmp.m4 b/m4/readutmp.m4
index bc85c5f4c..8774b2025 100644
--- a/m4/readutmp.m4
+++ b/m4/readutmp.m4
@@ -1,30 +1,37 @@
-# readutmp.m4 serial 11
-dnl Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# readutmp.m4 serial 19
+dnl Copyright (C) 2002-2011 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.
 
 AC_DEFUN([gl_READUTMP],
 [
-  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 Persuade utmpx.h to declare utmpxname
+  AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
 
+  AC_CHECK_HEADERS_ONCE([utmp.h utmpx.h])
+  if test $ac_cv_header_utmp_h = yes || test $ac_cv_header_utmpx_h = yes; then
     dnl Prerequisites of lib/readutmp.h and lib/readutmp.c.
     AC_REQUIRE([AC_C_INLINE])
-    AC_REQUIRE([gl_FUNC_FREE])
-    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
 #ifdef HAVE_UTMP_H
+# if defined _THREAD_SAFE && defined UTMP_DATA_INIT
+   /* When including both utmp.h and utmpx.h on AIX 4.3, with _THREAD_SAFE
+      defined, work around the duplicate struct utmp_data declaration.  */
+#  define utmp_data gl_aix_4_3_workaround_utmp_data
+# endif
 # include <utmp.h>
 #endif
 "