X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Freadutmp.m4;h=ac413f6c14a64c3e79332a3063aeee126a8a3012;hb=31507e5ef8d0839ae990c00c08289803301c93fc;hp=81d7642e0bd02deaaf07d5cbc9ff578764067210;hpb=62a39c7d945eb4160c206242b85c624fb2fb21fd;p=gnulib.git

diff --git a/m4/readutmp.m4 b/m4/readutmp.m4
index 81d7642e0..ac413f6c1 100644
--- a/m4/readutmp.m4
+++ b/m4/readutmp.m4
@@ -1,4 +1,4 @@
-# readutmp.m4 serial 7
+# readutmp.m4 serial 9
 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,
@@ -9,9 +9,11 @@ AC_DEFUN([gl_READUTMP],
   AC_LIBSOURCES([readutmp.c, readutmp.h])
   AC_LIBOBJ([readutmp])
 
-  dnl Prerequisites of lib/readutmp.h.
-  AC_CHECK_HEADERS(utmp.h utmpx.h)
-  AC_CHECK_FUNCS(utmpname utmpxname)
+  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,,,[
 #ifdef HAVE_UTMP_H
 # include <utmp.h>
@@ -49,14 +51,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])
-])