From 667277daf47d0661d15dd959605a6bbc6f24e548 Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Tue, 24 Aug 2010 10:52:07 -0600 Subject: [PATCH] getloadavg: don't define SVR4 on cygwin * m4/getloadavg.m4 (gl_GETLOADAVG): Sync with autoconf fix, to only define SVR4 when -lkvm is required. Reported by Yaakov Selkowitz. Signed-off-by: Eric Blake --- ChangeLog | 7 +++++++ m4/getloadavg.m4 | 5 ++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 298b5374f..ef7a7c426 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2010-08-24 Eric Blake + + getloadavg: don't define SVR4 on cygwin + * m4/getloadavg.m4 (gl_GETLOADAVG): Sync with autoconf fix, to + only define SVR4 when -lkvm is required. + Reported by Yaakov Selkowitz. + 2010-08-24 Bruno Haible priv-set: fix comment diff --git a/m4/getloadavg.m4 b/m4/getloadavg.m4 index 0a731c4f9..805fbca80 100644 --- a/m4/getloadavg.m4 +++ b/m4/getloadavg.m4 @@ -7,6 +7,8 @@ # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +#serial 2 + # Autoconf defines AC_FUNC_GETLOADAVG, but that is obsolescent. # New applications should use gl_GETLOADAVG instead. @@ -144,7 +146,8 @@ AC_CHECK_HEADER([sys/dg_sys_info.h], # We cannot check for , because Solaris 2 does not use dwarf (it # uses stabs), but it is still SVR4. We cannot check for because # Irix 4.0.5F has the header but not the library. -if test $gl_have_func = no && test "$ac_cv_lib_elf_elf_begin" = yes; then +if test $gl_have_func = no && test "$ac_cv_lib_elf_elf_begin" = yes \ + && test "$ac_cv_lib_kvm_kvm_open" = yes; then gl_have_func=yes AC_DEFINE([SVR4], [1], [Define to 1 on System V Release 4.]) fi -- 2.11.0