diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2005-03-30 05:20:25 +0000 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2005-03-30 05:20:25 +0000 |
| commit | 36b0e994184f17129dfad7658ca5e5a0f00cc89c (patch) | |
| tree | 770335c5514043301a2fa0fda02a8a3a389bb18e /m4 | |
| parent | 3e5310af44273139463599c0afd7d0fa751e7bbb (diff) | |
| download | coreutils-36b0e994184f17129dfad7658ca5e5a0f00cc89c.tar.xz | |
(gl_READUTMP): Require AC_C_INLINE.
Use AC_CHECK_HEADERS_ONCE and AC_CHECK_FUNCS_ONCE when possible.
Remove duplicate call to AC_LIBOBJ(readutmp).
(gl_PREREQ_READUTMP): Remove. All uses removed. This module
no longer relies on free (NULL) working.
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/readutmp.m4 | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/m4/readutmp.m4 b/m4/readutmp.m4 index 81d7642e0..d09294b25 100644 --- a/m4/readutmp.m4 +++ b/m4/readutmp.m4 @@ -1,4 +1,4 @@ -# readutmp.m4 serial 7 +# readutmp.m4 serial 8 dnl Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -10,8 +10,9 @@ AC_DEFUN([gl_READUTMP], AC_LIBOBJ([readutmp]) dnl Prerequisites of lib/readutmp.h. - AC_CHECK_HEADERS(utmp.h utmpx.h) - AC_CHECK_FUNCS(utmpname utmpxname) + AC_REQUIRE([AC_C_INLINE]) + AC_CHECK_HEADERS_ONCE(utmp.h utmpx.h) + AC_CHECK_FUNCS_ONCE(utmpname utmpxname) AC_CHECK_DECLS(getutent,,,[ #ifdef HAVE_UTMP_H # include <utmp.h> @@ -49,14 +50,5 @@ $ac_includes_default AC_CHECK_MEMBERS([struct utmp.ut_exit.ut_termination],,,[$utmp_includes]) AC_CHECK_MEMBERS([struct utmpx.ut_exit.e_termination],,,[$utmp_includes]) AC_CHECK_MEMBERS([struct utmp.ut_exit.e_termination],,,[$utmp_includes]) - - AC_LIBOBJ(readutmp) - gl_PREREQ_READUTMP fi ]) - -# Prerequisites of lib/readutmp.c. -AC_DEFUN([gl_PREREQ_READUTMP], -[ - AC_REQUIRE([gl_FUNC_FREE]) -]) |