X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=m4%2Freadutmp.m4;h=d4c900878a367f14b3eadc3fdbe86d8f6afa8199;hb=ffd19c4888f8a52d7e7cb8d8edf806deca4eef1b;hp=55a2be86161658cabe696d9f4f5d54ef392d31f1;hpb=901bc47c9a8db854db97bb28780352748020c81d;p=gnulib.git

diff --git a/m4/readutmp.m4 b/m4/readutmp.m4
index 55a2be861..d4c900878 100644
--- a/m4/readutmp.m4
+++ b/m4/readutmp.m4
@@ -1,30 +1,37 @@
-# readutmp.m4 serial 10
-dnl Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# readutmp.m4 serial 16
+dnl Copyright (C) 2002-2010 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_LIBOBJ([readutmp])
+  dnl Persuade utmpx.h to declare utmpxname
+  AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
 
-  dnl Prerequisites of lib/readutmp.h and lib/readutmp.c.
-  AC_REQUIRE([AC_C_INLINE])
-  AC_REQUIRE([gl_FUNC_FREE])
-  AC_CHECK_HEADERS_ONCE(utmp.h utmpx.h)
-  AC_CHECK_FUNCS_ONCE(utmpname utmpxname)
-  AC_CHECK_DECLS(getutent,,,[
+  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],,,[
 #ifdef HAVE_UTMP_H
 # include <utmp.h>
 #endif
 ])
-  if test $ac_cv_header_utmp_h = yes || test $ac_cv_header_utmpx_h = yes; then
     utmp_includes="\
 $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
 "