X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Freadutmp.m4;h=ac413f6c14a64c3e79332a3063aeee126a8a3012;hb=ecf3c116dd00cbe3e4a4ee205004770a3f60793f;hp=dd9ae9e600f8c20bb541a6c16f77a45ea31d8496;hpb=44d7c1c1f004fa9bfb8ec3948de2671a7958cf5b;p=gnulib.git

diff --git a/m4/readutmp.m4 b/m4/readutmp.m4
index dd9ae9e60..ac413f6c1 100644
--- a/m4/readutmp.m4
+++ b/m4/readutmp.m4
@@ -1,14 +1,19 @@
-# readutmp.m4 serial 6
-dnl Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
+# 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,
 dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_READUTMP],
 [
-  dnl Prerequisites of lib/readutmp.h.
-  AC_CHECK_HEADERS(utmp.h utmpx.h)
-  AC_CHECK_FUNCS(utmpname utmpxname)
+  AC_LIBSOURCES([readutmp.c, readutmp.h])
+  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_HEADERS_ONCE(utmp.h utmpx.h)
+  AC_CHECK_FUNCS_ONCE(utmpname utmpxname)
   AC_CHECK_DECLS(getutent,,,[
 #ifdef HAVE_UTMP_H
 # include <utmp.h>
@@ -46,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])
-])