X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Freadutmp.m4;h=ac413f6c14a64c3e79332a3063aeee126a8a3012;hb=5cc13c0f36d18dd428c7cceebd30ff8de6e2ff1e;hp=2f7b53ca823094355c954735db24284d7ab4abd3;hpb=0df69f65831f189da8244e3124acd6fea4c354d8;p=gnulib.git diff --git a/m4/readutmp.m4 b/m4/readutmp.m4 index 2f7b53ca8..ac413f6c1 100644 --- a/m4/readutmp.m4 +++ b/m4/readutmp.m4 @@ -1,16 +1,19 @@ -# readutmp.m4 serial 5 -dnl Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc. -dnl This file is free software, distributed under the terms of the GNU -dnl General Public License. As a special exception to the GNU General -dnl Public License, this file may be distributed as part of a program -dnl that contains a configuration script generated by Autoconf, under -dnl the same distribution terms as the rest of that program. +# 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 @@ -48,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]) -])