* lib/readutmp.h: Skip most definitions if neither <utmp.h> nor

<utmpx.h> exists.
* m4/readutmp.m4 (gl_READUTMP): Compile readutmp.c only if <utmp.h> or
<utmpx.h> exists.

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 609336fdbb81d74715497d1b11689340aa5cf0ae..0ff5c45c495258d01ea03e26353493cbb9662c43 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,8 @@
+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.

diff --git a/lib/readutmp.h b/lib/readutmp.h
index 9b88bd11f71f00fd29c0fa181091be391bac8cd6..8983a85a343b08cdd340508699d07d328c47c5be 100644 (file)
--- a/lib/readutmp.h
+++ b/lib/readutmp.h
@@ -31,8 +31,8 @@
 #  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
@@ -66,7 +66,8 @@
 #   endif
 #  endif
 
-# else
+# elif HAVE_UTMP_H
+
 #  include <utmp.h>
 #  if !HAVE_DECL_GETUTENT
     struct utmp *getutent();
@@ -103,7 +104,7 @@
 # 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)
@@ -113,7 +114,7 @@
 #   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)

diff --git a/m4/ChangeLog b/m4/ChangeLog
index f3adfbbcf630de4753cac39537b5d22daa64a531..3718d7f2946da1f3b4edf58536dcfe9033723b4b 100644 (file)
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,8 @@
+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):

diff --git a/m4/readutmp.m4 b/m4/readutmp.m4
index 55a2be86161658cabe696d9f4f5d54ef392d31f1..bc85c5f4cfbf727c4eb3accaa36abec4f691647d 100644 (file)
--- a/m4/readutmp.m4
+++ b/m4/readutmp.m4
@@ -1,4 +1,4 @@
-# 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,
@@ -6,19 +6,19 @@ dnl with or without modifications, as long as this notice is preserved.
 
 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