+2006-08-22 Bruno Haible <bruno@clisp.org>
+
+ * readutmp.h: Skip most definitions if neither <utmp.h> nor
+ <utmpx.h> exists.
+
2006-08-21 Paul Eggert <eggert@cs.ucla.edu>
BeOS portability.
# undef HAVE_UTMPX_H
# endif
-# ifdef HAVE_UTMPX_H
-# ifdef HAVE_UTMP_H
+# if HAVE_UTMPX_H
+# if HAVE_UTMP_H
/* HPUX 10.20 needs utmp.h, for the definition of e.g., UTMP_FILE. */
# include <utmp.h>
# endif
# endif
# endif
-# else
+# elif HAVE_UTMP_H
+
# include <utmp.h>
# if !HAVE_DECL_GETUTENT
struct utmp *getutent();
# endif
/* Accessor macro for the member named ut_user or ut_name. */
-# ifdef HAVE_UTMPX_H
+# if HAVE_UTMPX_H
# if HAVE_STRUCT_UTMPX_UT_USER
# define UT_USER(Utmp) ((Utmp)->ut_user)
# define UT_USER(Utmp) ((Utmp)->ut_name)
# endif
-# else
+# elif HAVE_UTMP_H
# if HAVE_STRUCT_UTMP_UT_USER
# define UT_USER(Utmp) ((Utmp)->ut_user)
+2006-08-22 Bruno Haible <bruno@clisp.org>
+
+ * readutmp.m4 (gl_READUTMP): Compile readutmp.c only if <utmp.h> or
+ <utmpx.h> exists.
+
2006-08-22 Paul Eggert <eggert@cs.ucla.edu>
* rijndael.m4 (gl_ARCFOUR):
-# readutmp.m4 serial 10
+# readutmp.m4 serial 11
dnl Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
AC_DEFUN([gl_READUTMP],
[
- 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,,,[
+ if test $ac_cv_header_utmp_h = yes || test $ac_cv_header_utmpx_h = yes; then
+ 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_FUNCS_ONCE(utmpname utmpxname)
+ AC_CHECK_DECLS(getutent,,,[
#ifdef HAVE_UTMP_H
# include <utmp.h>
#endif
])
- if test $ac_cv_header_utmp_h = yes || test $ac_cv_header_utmpx_h = yes; then
utmp_includes="\
$ac_includes_default
#ifdef HAVE_UTMPX_H