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

diff --git a/m4/readutmp.m4 b/m4/readutmp.m4
index bc85c5f4c..a88e0fd90 100644
--- a/m4/readutmp.m4
+++ b/m4/readutmp.m4
@@ -1,20 +1,22 @@
-# readutmp.m4 serial 11
-dnl Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# readutmp.m4 serial 16
+dnl Copyright (C) 2002-2009 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)
+  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
     AC_LIBOBJ([readutmp])
 
     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],,,[
 #ifdef HAVE_UTMP_H
 # include <utmp.h>
 #endif
@@ -25,6 +27,11 @@ $ac_includes_default
 # 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
 "