getloadavg: simplify code

(cherry picked from commit 8c8ee4b42b27dc64291761cb52707ce2df1cbb6c)

diff --git a/ChangeLog b/ChangeLog
index ef7a7c4..660ec9b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-08-24  Bruno Haible  <bruno@clisp.org>
+
+       getloadavg: simplify code
+       * m4/getloadavg.m4 (gl_GETLOADAVG): Remove useless test of
+       gl_have_func. Update comments.
+
 2010-08-24  Eric Blake  <eblake@redhat.com>
 
        getloadavg: don't define SVR4 on cygwin

diff --git a/m4/getloadavg.m4 b/m4/getloadavg.m4
index 805fbca..c4664f8 100644 (file)
--- a/m4/getloadavg.m4
+++ b/m4/getloadavg.m4
@@ -45,11 +45,10 @@ test $ac_cv_lib_perfstat_perfstat_cpu_total = yes && gl_have_func=yes
 # Some systems with -lutil have (and need) -lkvm as well, some do not.
 # On Solaris, -lkvm requires nlist from -lelf, so check that first
 # to get the right answer into the cache.
-# For kstat on solaris, we need libelf to force the definition of SVR4 below.
+# For kstat on solaris, we need to test for libelf and libkvm to force the
+# definition of SVR4 below.
 if test $gl_have_func = no; then
   AC_CHECK_LIB([elf], [elf_begin], [LIBS="-lelf $LIBS"])
-fi
-if test $gl_have_func = no; then
   AC_CHECK_LIB([kvm], [kvm_open], [LIBS="-lkvm $LIBS"])
   # Check for the 4.4BSD definition of getloadavg.
   AC_CHECK_LIB([util], [getloadavg],