From 8c8ee4b42b27dc64291761cb52707ce2df1cbb6c Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Tue, 24 Aug 2010 21:53:44 +0200 Subject: [PATCH] getloadavg: simplify code --- ChangeLog | 6 ++++++ m4/getloadavg.m4 | 5 ++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index ef7a7c426..660ec9bb0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2010-08-24 Bruno Haible + + getloadavg: simplify code + * m4/getloadavg.m4 (gl_GETLOADAVG): Remove useless test of + gl_have_func. Update comments. + 2010-08-24 Eric Blake getloadavg: don't define SVR4 on cygwin diff --git a/m4/getloadavg.m4 b/m4/getloadavg.m4 index 805fbca80..c4664f874 100644 --- 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], -- 2.11.0