summaryrefslogtreecommitdiff
path: root/m4/readutmp.m4
diff options
context:
space:
mode:
Diffstat (limited to 'm4/readutmp.m4')
-rw-r--r--m4/readutmp.m422
1 files changed, 10 insertions, 12 deletions
diff --git a/m4/readutmp.m4 b/m4/readutmp.m4
index 2e520cd..62e2772 100644
--- a/m4/readutmp.m4
+++ b/m4/readutmp.m4
@@ -1,5 +1,5 @@
-# readutmp.m4 serial 13
-dnl Copyright (C) 2002-2007 Free Software Foundation, Inc.
+# readutmp.m4 serial 20
+dnl Copyright (C) 2002-2016 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.
@@ -7,23 +7,21 @@ dnl with or without modifications, as long as this notice is preserved.
AC_DEFUN([gl_READUTMP],
[
dnl Persuade utmpx.h to declare utmpxname
- AC_REQUIRE([AC_GNU_SOURCE])
+ 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_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