From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 30 Mar 2005 05:20:25 +0000 (+0000)
Subject: (gl_READUTMP): Require AC_C_INLINE.
X-Git-Tag: CPPI-1_12~1150
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=36b0e994184f17129dfad7658ca5e5a0f00cc89c;p=thirdparty%2Fcoreutils.git

(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.
---

diff --git a/m4/readutmp.m4 b/m4/readutmp.m4
index 81d7642e0b..d09294b250 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])
-])